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

merge from master

Browse Source 
Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9
This commit is contained in:
Jack Yu
2015-12-10 12:27:58 -08:00
parent 8366fdd6a8
commit 6714030083
32 changed files with 355 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,6 +432,7 @@ public final class SystemServer {
NsdService serviceDiscovery= null;
WindowManagerService wm = null;
UsbService usb = null;
BluetoothManagerService bluetooth = null;
SerialService serial = null;
NetworkTimeUpdateService networkTimeUpdater = null;
CommonTimeManagementService commonTimeMgmtService = null;
@@ -441,7 +442,6 @@ public final class SystemServer {
AudioService audioService = null;
MmsServiceBroker mmsService = null;
EntropyMixer entropyMixer = null;
CameraService cameraService = null;
boolean disableStorage = SystemProperties.getBoolean("config.disable_storage", false);
boolean disableBluetooth = SystemProperties.getBoolean("config.disable_bluetooth", false);
@@ -1333,7 +1333,7 @@ public final class SystemServer {
intent.setComponent(new ComponentName("com.android.systemui",
"com.android.systemui.SystemUIService"));
//Slog.d(TAG, "Starting service: " + intent);
context.startServiceAsUser(intent, UserHandle.OWNER);
context.startServiceAsUser(intent, UserHandle.SYSTEM);
}
private static void traceBeginAndSlog(String name) {