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

Add property to disable camera service proxy.

Browse Source 
am: 8adaec07f0

Change-Id: I9477a39ae23c346437f9eb37bd0bbeaf946dbbd4
This commit is contained in:
Ivan Podogov
2016-09-23 11:10:22 +00:00
committed by android-build-merger
parent b641c0c7b7 8adaec07f0
commit b8fdf0aa16
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,12 +549,14 @@ public final class SystemServer {
false);
boolean disableTrustManager = SystemProperties.getBoolean("config.disable_trustmanager",
false);
boolean disableTextServices = SystemProperties.getBoolean("config.disable_textservices", false);
boolean disableTextServices = SystemProperties.getBoolean("config.disable_textservices",
false);
boolean disableSamplingProfiler = SystemProperties.getBoolean("config.disable_samplingprof",
false);
boolean disableConsumerIr = SystemProperties.getBoolean("config.disable_consumerir", 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");
@@ -579,8 +581,10 @@ public final class SystemServer {
mContentResolver = context.getContentResolver();
Slog.i(TAG, "Camera Service");
mSystemServiceManager.startService(CameraService.class);
if (!disableCameraService) {
Slog.i(TAG, "Camera Service");
mSystemServiceManager.startService(CameraService.class);
}
// The AccountManager must come before the ContentService
traceBeginAndSlog("StartAccountManagerService");