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

Merge "Add property to disable camera service proxy." into cw-f-dev

Browse Source
This commit is contained in:
Ivan Podogov
2016-09-23 11:04:06 +00:00
committed by Android (Google) Code Review
parent c1b1be6bd9 8adaec07f0
commit fa10c2869b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,12 +549,14 @@ public final class SystemServer {
false); false);
boolean disableTrustManager = SystemProperties.getBoolean("config.disable_trustmanager", boolean disableTrustManager = SystemProperties.getBoolean("config.disable_trustmanager",
false); false);
boolean disableTextServices = SystemProperties.getBoolean("config.disable_textservices", false); boolean disableTextServices = SystemProperties.getBoolean("config.disable_textservices",
false);
boolean disableSamplingProfiler = SystemProperties.getBoolean("config.disable_samplingprof", boolean disableSamplingProfiler = SystemProperties.getBoolean("config.disable_samplingprof",
false); false);
boolean disableConsumerIr = SystemProperties.getBoolean("config.disable_consumerir", false); boolean disableConsumerIr = SystemProperties.getBoolean("config.disable_consumerir", false);
boolean disableVrManager = SystemProperties.getBoolean("config.disable_vrmanager", false); boolean disableVrManager = SystemProperties.getBoolean("config.disable_vrmanager", false);
boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
false);
boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1"); boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
@@ -579,8 +581,10 @@ public final class SystemServer {
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
if (!disableCameraService) {
Slog.i(TAG, "Camera Service"); Slog.i(TAG, "Camera Service");
mSystemServiceManager.startService(CameraService.class); mSystemServiceManager.startService(CameraService.class);
}
// The AccountManager must come before the ContentService // The AccountManager must come before the ContentService
traceBeginAndSlog("StartAccountManagerService"); traceBeginAndSlog("StartAccountManagerService");