Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Start the Wear Time System Service with SystemServer" into nyc-mr1-dev

Browse Source 
am: 96783005d7

* commit '96783005d7d2447d18ad17e430a90d213252c9a3':
  Start the Wear Time System Service with SystemServer

Change-Id: Ief7dcfd771a4a97ac23ed0617301043f92738b95
This commit is contained in:
Damien Bargiacchi
2016-05-19 21:02:43 +00:00
committed by android-build-merger
parent 60bacac2dd 96783005d7
commit 03be7972ee
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/SystemServer.java
View File

@@ -154,6 +154,8 @@ public final class SystemServer {
"com.google.android.clockwork.ThermalObserver";
private static final String WEAR_BLUETOOTH_SERVICE_CLASS =
"com.google.android.clockwork.bluetooth.WearBluetoothService";
private static final String WEAR_TIME_SERVICE_CLASS =
"com.google.android.clockwork.time.WearTimeService";
private static final String ACCOUNT_SERVICE_CLASS =
"com.android.server.accounts.AccountManagerService$Lifecycle";
private static final String CONTENT_SERVICE_CLASS =
@@ -1158,6 +1160,9 @@ public final class SystemServer {
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS);
if (!disableNonCoreServices) {
mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);
}
}
// Before things start rolling, be sure we have decided whether