Merge "Fixed Content Capture workflow when service package is updated." (4f3f18de) · Commits · e / os / android_frameworks_base

core/java/android/service/contentcapture/ContentCaptureService.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -367,7 +367,6 @@ public abstract class ContentCaptureService extends Service {
		stateFlags = initialState;
		} else {
		stateFlags \|= ContentCaptureSession.STATE_DISABLED;

		}
		setClientState(clientReceiver, stateFlags, mClientInterface.asBinder());
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -134,12 +134,19 @@ public abstract class ContentCaptureSession implements AutoCloseable {
		*/
		public static final int STATE_SERVICE_DIED = 0x400;

		/**
		* Session is disabled because the service package is being udpated.
		*
		* @hide
		*/
		public static final int STATE_SERVICE_UPDATING = 0x800;

		/**
		* Session is enabled, after the service died and came back to live.
		*
		* @hide
		*/
		public static final int STATE_SERVICE_RESURRECTED = 0x800;
		public static final int STATE_SERVICE_RESURRECTED = 0x1000;

		private static final int INITIAL_CHILDREN_CAPACITY = 5;

+2 −1

Original line number	Diff line number	Diff line
		@@ -230,7 +230,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession {

		/**
		* Callback from {@code system_server} after call to
		* {@link IContentCaptureManager#startSession(IBinder, ComponentName, String, int, IBinder)}
		* {@link IContentCaptureManager#startSession(IBinder, ComponentName, String, int,
		* IResultReceiver)}.
		*
		* @param resultCode session state
		* @param binder handle to {@code IContentCaptureDirectManager}

+5 −1

Original line number	Diff line number	Diff line
		@@ -481,7 +481,11 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I

		@Override
		public String toString() {
		return getClass().getSimpleName() + "[" + mComponentName + "]";
		return getClass().getSimpleName() + "[" + mComponentName
		+ " " + System.identityHashCode(this)
		+ (mService != null ? " (bound)" : " (unbound)")
		+ (mDestroyed ? " (destroyed)" : "")
		+ "]";
		}

		/**

+16 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,22 @@ public final class ContentCaptureManagerService extends
		service.destroyLocked();
		}

		@Override // from AbstractMasterSystemService
		protected void onServicePackageUpdatingLocked(int userId) {
		final ContentCapturePerUserService service = getServiceForUserLocked(userId);
		if (service != null) {
		service.onPackageUpdatingLocked();
		}
		}

		@Override // from AbstractMasterSystemService
		protected void onServicePackageUpdatedLocked(@UserIdInt int userId) {
		final ContentCapturePerUserService service = getServiceForUserLocked(userId);
		if (service != null) {
		service.onPackageUpdatedLocked();
		}
		}

		@Override // from AbstractMasterSystemService
		protected void enforceCallingPermissionForManagement() {
		getContext().enforceCallingPermission(MANAGE_CONTENT_CAPTURE, mTag);