Switch to the new Java-based RadioService.

As of now, the new service is meant to match all features from the old,
native service.

Bug: b/36863239
Test: instrumentalization
Change-Id: Ib579e433c62498afac91a67253b8b24cf0702b0a

1 files changed, 1 insertions, 4 deletions

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index fbcf20b584d0..ed5232681ef3 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -703,8 +703,6 @@ public final class SystemServer {
         boolean disableVrManager = SystemProperties.getBoolean("config.disable_vrmanager", false);
         boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
                 false);
-        // TODO(b/36863239): Remove when transitioned from native service.
-        boolean enableRadioService = SystemProperties.getBoolean("config.enable_java_radio", false);
         boolean enableLeftyService = SystemProperties.getBoolean("config.enable_lefty", false);
 
         boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
@@ -1206,8 +1204,7 @@ public final class SystemServer {
             mSystemServiceManager.startService(AudioService.Lifecycle.class);
             traceEnd();
 
-            if (enableRadioService &&
-                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_RADIO)) {
+            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_RADIO)) {
                 traceBeginAndSlog("StartRadioService");
                 mSystemServiceManager.startService(RadioService.class);
                 traceEnd();