Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0885645 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename CameraService to CameraServiceProxy"

parents 78e63bd6 ed7f5488

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

+6 −5
Original line number Diff line number Diff line
@@ -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();

services/java/com/android/server/SystemServer.java

+4 −4
Original line number Diff line number Diff line
@@ -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();

            }