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

Merge "Rename CameraService to CameraServiceProxy"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-22 19:36:55 +00:00
committed by Android (Google) Code Review
parent 78e63bd64a ed7f548832
commit e08856454f
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/camera/CameraService.java → services/core/java/com/android/server/camera/CameraServiceProxy.java
View File

@@ -40,11 +40,11 @@ import java.util.Collection;
import java.util.Set;
/**
* CameraService is the system_server analog to the camera service running in mediaserver.
* CameraServiceProxy is the system_server analog to the camera service running in mediaserver.
*
* @hide
*/
public class CameraService extends SystemService
public class CameraServiceProxy extends SystemService
implements Handler.Callback, IBinder.DeathRecipient {
private static final String TAG = "CameraService_proxy";
private static final boolean DEBUG = false;
@@ -131,7 +131,7 @@ public class CameraService extends SystemService
}
};
public CameraService(Context context) {
public CameraServiceProxy(Context context) {
super(context);
mContext = context;
mHandlerThread = new ServiceThread(TAG, Process.THREAD_PRIORITY_DISPLAY, /*allowTo*/false);
@@ -149,7 +149,7 @@ public class CameraService extends SystemService
notifySwitchWithRetries(msg.arg1);
} break;
default: {
Slog.e(TAG, "CameraService error, invalid message: " + msg.what);
Slog.e(TAG, "CameraServiceProxy error, invalid message: " + msg.what);
} break;
}
return true;
@@ -160,7 +160,8 @@ public class CameraService extends SystemService
mUserManager = UserManager.get(mContext);
if (mUserManager == null) {
// Should never see this unless someone messes up the SystemServer service boot order.
throw new IllegalStateException("UserManagerService must start before CameraService!");
throw new IllegalStateException("UserManagerService must start before" +
" CameraServiceProxy!");
}
IntentFilter filter = new IntentFilter();

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

@@ -61,7 +61,7 @@ import com.android.internal.widget.ILockSettings;
import com.android.server.accessibility.AccessibilityManagerService;
import com.android.server.am.ActivityManagerService;
import com.android.server.audio.AudioService;
import com.android.server.camera.CameraService;
import com.android.server.camera.CameraServiceProxy;
import com.android.server.clipboard.ClipboardService;
import com.android.server.connectivity.IpConnectivityMetrics;
import com.android.server.coverage.CoverageService;
@@ -735,9 +735,9 @@ public final class SystemServer {
mContentResolver = context.getContentResolver();
if (!disableCameraService) {
Slog.i(TAG, "Camera Service");
traceBeginAndSlog("StartCameraService");
mSystemServiceManager.startService(CameraService.class);
Slog.i(TAG, "Camera Service Proxy");
traceBeginAndSlog("StartCameraServiceProxy");
mSystemServiceManager.startService(CameraServiceProxy.class);
traceEnd();
}