commit 6b4b646d9c0fa42973a429dbe78c8919a2772961
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Jul 19 10:52:28 2017 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Wed Jul 19 16:26:46 2017 -0700
tree 65166180f415d66ab3f20a7e99ef02c94bd5634a
parent 6e292694612780d8d5ce90917c12a33c517c6993

Rename (FM) Radio to Broadcast Radio to avoid confusion with (GSM) Radio.

Bug: b/63405337
Test: instrumentation

Change-Id: I33c3e450602e521b77b6167f9866278980f17743

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index d10cc02..8574728 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -97,7 +97,7 @@
 import com.android.server.policy.PhoneWindowManager;
 import com.android.server.power.PowerManagerService;
 import com.android.server.power.ShutdownThread;
-import com.android.server.radio.RadioService;
+import com.android.server.broadcastradio.BroadcastRadioService;
 import com.android.server.restrictions.RestrictionsManagerService;
 import com.android.server.retaildemo.RetailDemoModeService;
 import com.android.server.security.KeyAttestationApplicationIdProviderService;
@@ -1208,7 +1208,7 @@
 
             if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_BROADCAST_RADIO)) {
                 traceBeginAndSlog("StartBroadcastRadioService");
-                mSystemServiceManager.startService(RadioService.class);
+                mSystemServiceManager.startService(BroadcastRadioService.class);
                 traceEnd();
             }