Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e0bf818 authored by Josh Yang's avatar Josh Yang
Browse files

Temporarily disable wearable system services. 

Wearable system service code has been disabled due to compile issues. We
need to temporarily disable these services in system server to unblock
system bring up.

Bug: 191419780
Bug: 191493915
Fix: 191493915
Fix: 191419780

Test: class not found error is gone.
Change-Id: I177f04ff1ff5b43c242367d9741e829550ed8e36
parent 2b225780

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

+7 −1
Original line number Diff line number Diff line
@@ -2070,11 +2070,14 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(DockObserver.class);

            t.traceEnd();



            // TODO(b/191495635): re-enable thermal observer after fixing b/191375904.

            /*

            if (isWatch) {

                t.traceBegin("StartThermalObserver");

                mSystemServiceManager.startService(THERMAL_OBSERVER_CLASS);

                t.traceEnd();

            }

            */



            t.traceBegin("StartWiredAccessoryManager");

            try {
@@ -2428,6 +2431,8 @@ public final class SystemServer implements Dumpable { 
            t.traceEnd();

        }



        // TODO(b/191495635): Re-enable these services after fixing b/191375904.

       /*

       if (isWatch) {

            // Must be started before services that depend it, e.g. WearConnectivityService

            t.traceBegin("StartWearPowerService");
@@ -2456,6 +2461,7 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(WEAR_GLOBAL_ACTIONS_SERVICE_CLASS);

            t.traceEnd();

        }

        */



        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_SLICES_DISABLED)) {

            t.traceBegin("StartSliceManagerService");