am 096c11dc: Merge "camera2: Fix work-profile eviction handling." into mnc-dev (705c71b5) · Commits · e / os / android_frameworks_base

core/java/android/hardware/ICameraService.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,5 +81,5 @@ interface ICameraService
	*		*
	* Callers require the android.permission.CAMERA_SEND_SYSTEM_EVENTS permission.		* Callers require the android.permission.CAMERA_SEND_SYSTEM_EVENTS permission.
	*/		*/
	oneway void notifySystemEvent(int eventId, int arg0);		oneway void notifySystemEvent(int eventId, in int[] args);
	}		}

core/java/android/os/UserManager.java

+20 −1

Original line number	Original line	Diff line number	Diff line
	@@ -936,7 +936,7 @@ public class UserManager {
	* Returns list of the profiles of userHandle including		* Returns list of the profiles of userHandle including
	* userHandle itself.		* userHandle itself.
	* Note that this returns both enabled and not enabled profiles. See		* Note that this returns both enabled and not enabled profiles. See
	* {@link #getUserProfiles()} if you need only the enabled ones.		* {@link #getEnabledProfiles(int)} if you need only the enabled ones.
	*		*
	* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.		* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
	* @param userHandle profiles of this user will be returned.		* @param userHandle profiles of this user will be returned.
	@@ -952,6 +952,25 @@ public class UserManager {
	}		}
	}		}

			/**
			* Returns list of the profiles of userHandle including
			* userHandle itself.
			* Note that this returns only enabled.
			*
			* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
			* @param userHandle profiles of this user will be returned.
			* @return the list of profiles.
			* @hide
			*/
			public List<UserInfo> getEnabledProfiles(int userHandle) {
			try {
			return mService.getProfiles(userHandle, true /* enabledOnly */);
			} catch (RemoteException re) {
			Log.w(TAG, "Could not get user list", re);
			return null;
			}
			}

	/**		/**
	* Returns a list of UserHandles for profiles associated with the user that the calling process		* Returns a list of UserHandles for profiles associated with the user that the calling process
	* is running on, including the user itself.		* is running on, including the user itself.

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

+65 −8

Original line number	Original line	Diff line number	Diff line
	@@ -15,13 +15,21 @@
	*/		*/
	package com.android.server.camera;		package com.android.server.camera;

			import android.app.ActivityManager;
	import android.content.Context;		import android.content.Context;
			import android.content.pm.UserInfo;
	import android.hardware.ICameraService;		import android.hardware.ICameraService;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.RemoteException;		import android.os.RemoteException;
			import android.os.UserManager;

	import com.android.server.SystemService;		import com.android.server.SystemService;

			import java.util.Collection;
			import java.util.HashSet;
			import java.util.List;
			import java.util.Set;

	/**		/**
	* CameraService is the system_server analog to the camera service running in mediaserver.		* CameraService is the system_server analog to the camera service running in mediaserver.
	*		*
	@@ -38,29 +46,78 @@ public class CameraService extends SystemService {
	public static final int NO_EVENT = 0; // NOOP		public static final int NO_EVENT = 0; // NOOP
	public static final int USER_SWITCHED = 1; // User changed, argument is the new user handle		public static final int USER_SWITCHED = 1; // User changed, argument is the new user handle

			private final Context mContext;
			private UserManager mUserManager;
			private Set<Integer> mEnabledCameraUsers;

	public CameraService(Context context) {		public CameraService(Context context) {
	super(context);		super(context);
			mContext = context;
			}

			@Override
			public void onStart() {
			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!");
			}
	}		}

	@Override		@Override
	public void onStart() {}		public void onStartUser(int userHandle) {
			if (mEnabledCameraUsers == null) {
			// Initialize mediaserver, or update mediaserver if we are recovering from a crash.
			onSwitchUser(userHandle);
			}
			}

	@Override		@Override
	public void onSwitchUser(int userHandle) {		public void onSwitchUser(int userHandle) {
	super.onSwitchUser(userHandle);		Set<Integer> currentUserHandles = getEnabledUserHandles(userHandle);
			if (mEnabledCameraUsers == null \|\| !mEnabledCameraUsers.equals(currentUserHandles)) {
			// Some user handles have been added or removed, update mediaserver.
			mEnabledCameraUsers = currentUserHandles;
			notifyMediaserver(USER_SWITCHED, currentUserHandles);
			}
			}

	/**
	* Forward the user switch event to the native camera service running in mediaserver.		private Set<Integer> getEnabledUserHandles(int currentUserHandle) {
	*/		List<UserInfo> userProfiles = mUserManager.getEnabledProfiles(currentUserHandle);
			Set<Integer> handles = new HashSet<>(userProfiles.size());

			for (UserInfo i : userProfiles) {
			handles.add(i.id);
			}

			return handles;
			}

			private void notifyMediaserver(int eventType, Set<Integer> updatedUserHandles) {
			// Forward the user switch event to the native camera service running in the mediaserver
			// process.
	IBinder cameraServiceBinder = getBinderService(CAMERA_SERVICE_BINDER_NAME);		IBinder cameraServiceBinder = getBinderService(CAMERA_SERVICE_BINDER_NAME);
	if (cameraServiceBinder == null) {		if (cameraServiceBinder == null) {
	return; // Camera service not active, there is no need to evict user clients.		return; // Camera service not active, cannot evict user clients.
	}		}

	ICameraService cameraServiceRaw = ICameraService.Stub.asInterface(cameraServiceBinder);		ICameraService cameraServiceRaw = ICameraService.Stub.asInterface(cameraServiceBinder);

	try {		try {
	cameraServiceRaw.notifySystemEvent(USER_SWITCHED, userHandle);		cameraServiceRaw.notifySystemEvent(eventType, toArray(updatedUserHandles));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Do nothing, if camera service is dead, there is no need to evict user clients.		// Not much we can do if camera service is dead.
			}
			}

			private static int[] toArray(Collection<Integer> c) {
			int len = c.size();
			int[] ret = new int[len];
			int idx = 0;
			for (Integer i : c) {
			ret[idx++] = i;
	}		}
			return ret;
	}		}
	}		}