release-request-946c768b-83eb-4b7b-83e7-5737856fa8ec-for-git_oc-mr1-release-43... (a6b610c0) · Commits · e / os / android_frameworks_base

core/java/android/accessibilityservice/AccessibilityService.java

+40 −24

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ParceledListSlice;
		import android.graphics.Region;
		import android.hardware.fingerprint.FingerprintManager;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Looper;
		@@ -52,8 +51,6 @@ import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.List;

		import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;

		/**
		* Accessibility services should only be used to assist users with disabilities in using
		* Android devices and apps. They run in the background and receive callbacks by the system
		@@ -394,7 +391,7 @@ public abstract class AccessibilityService extends Service {
		public static final int SHOW_MODE_AUTO = 0;
		public static final int SHOW_MODE_HIDDEN = 1;

		private int mConnectionId;
		private int mConnectionId = AccessibilityInteractionClient.NO_ID;

		private AccessibilityServiceInfo mInfo;

		@@ -1612,7 +1609,7 @@ public abstract class AccessibilityService extends Service {

		private final Callbacks mCallback;

		private int mConnectionId;
		private int mConnectionId = AccessibilityInteractionClient.NO_ID;

		public IAccessibilityServiceClientWrapper(Context context, Looper looper,
		Callbacks callback) {
		@@ -1707,7 +1704,8 @@ public abstract class AccessibilityService extends Service {
		if (event != null) {
		// Send the event to AccessibilityCache via AccessibilityInteractionClient
		AccessibilityInteractionClient.getInstance().onAccessibilityEvent(event);
		if (serviceWantsEvent) {
		if (serviceWantsEvent
		&& (mConnectionId != AccessibilityInteractionClient.NO_ID)) {
		// Send the event to AccessibilityService
		mCallback.onAccessibilityEvent(event);
		}
		@@ -1721,7 +1719,9 @@ public abstract class AccessibilityService extends Service {
		} return;

		case DO_ON_INTERRUPT: {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		mCallback.onInterrupt();
		}
		} return;

		case DO_INIT: {
		@@ -1746,8 +1746,10 @@ public abstract class AccessibilityService extends Service {
		} return;

		case DO_ON_GESTURE: {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		final int gestureId = message.arg1;
		mCallback.onGesture(gestureId);
		}
		} return;

		case DO_CLEAR_ACCESSIBILITY_CACHE: {
		@@ -1779,37 +1781,51 @@ public abstract class AccessibilityService extends Service {
		} return;

		case DO_ON_MAGNIFICATION_CHANGED: {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		final SomeArgs args = (SomeArgs) message.obj;
		final Region region = (Region) args.arg1;
		final float scale = (float) args.arg2;
		final float centerX = (float) args.arg3;
		final float centerY = (float) args.arg4;
		mCallback.onMagnificationChanged(region, scale, centerX, centerY);
		}
		} return;

		case DO_ON_SOFT_KEYBOARD_SHOW_MODE_CHANGED: {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		final int showMode = (int) message.arg1;
		mCallback.onSoftKeyboardShowModeChanged(showMode);
		}
		} return;

		case DO_GESTURE_COMPLETE: {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		final boolean successfully = message.arg2 == 1;
		mCallback.onPerformGestureResult(message.arg1, successfully);
		}
		} return;
		case DO_ON_FINGERPRINT_ACTIVE_CHANGED: {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		mCallback.onFingerprintCapturingGesturesChanged(message.arg1 == 1);
		}
		} return;
		case DO_ON_FINGERPRINT_GESTURE: {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		mCallback.onFingerprintGesture(message.arg1);
		}
		} return;

		case (DO_ACCESSIBILITY_BUTTON_CLICKED): {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		mCallback.onAccessibilityButtonClicked();
		}
		} return;

		case (DO_ACCESSIBILITY_BUTTON_AVAILABILITY_CHANGED): {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		final boolean available = (message.arg1 != 0);
		mCallback.onAccessibilityButtonAvailabilityChanged(available);
		}
		} return;

		default :

core/java/android/content/pm/ApplicationInfo.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -718,6 +718,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		* Cycles do not exist because they are illegal and screened for during installation.
		*
		* May be null if no splits are installed, or if no dependencies exist between them.
		*
		* NOTE: Any change to the way split dependencies are stored must update the logic that
		* creates the class loader context for dexopt (DexoptUtils#getClassLoaderContexts).
		*
		* @hide
		*/
		public SparseArray<int[]> splitDependencies;

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -1769,7 +1769,7 @@ public class CameraDeviceImpl extends CameraDevice
		}

		@Override
		public void onRepeatingRequestError(long lastFrameNumber) {
		public void onRepeatingRequestError(long lastFrameNumber, int repeatingRequestId) {
		if (DEBUG) {
		Log.d(TAG, "Repeating request error received. Last frame number is " +
		lastFrameNumber);
		@@ -1782,9 +1782,12 @@ public class CameraDeviceImpl extends CameraDevice
		}

		checkEarlyTriggerSequenceComplete(mRepeatingRequestId, lastFrameNumber);
		// Check if there is already a new repeating request
		if (mRepeatingRequestId == repeatingRequestId) {
		mRepeatingRequestId = REQUEST_ID_NONE;
		}
		}
		}

		@Override
		public void onDeviceIdle() {

core/java/android/hardware/camera2/legacy/CameraDeviceState.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ public class CameraDeviceState {
		void onCaptureStarted(RequestHolder holder, long timestamp);
		void onCaptureResult(CameraMetadataNative result, RequestHolder holder);
		void onRequestQueueEmpty();
		void onRepeatingRequestError(long lastFrameNumber);
		void onRepeatingRequestError(long lastFrameNumber, int repeatingRequestId);
		}

		/**
		@@ -208,12 +208,14 @@ public class CameraDeviceState {
		* <p>Repeating request has been stopped due to an error such as abandoned output surfaces.</p>
		*
		* @param lastFrameNumber Frame number of the last repeating request before it is stopped.
		* @param repeatingRequestId The ID of the repeating request being stopped
		*/
		public synchronized void setRepeatingRequestError(final long lastFrameNumber) {
		public synchronized void setRepeatingRequestError(final long lastFrameNumber,
		final int repeatingRequestId) {
		mCurrentHandler.post(new Runnable() {
		@Override
		public void run() {
		mCurrentListener.onRepeatingRequestError(lastFrameNumber);
		mCurrentListener.onRepeatingRequestError(lastFrameNumber, repeatingRequestId);
		}
		});
		}

core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -264,10 +264,10 @@ public class CameraDeviceUserShim implements ICameraDeviceUser {
		}

		@Override
		public void onRepeatingRequestError(long lastFrameNumber) {
		public void onRepeatingRequestError(long lastFrameNumber, int repeatingRequestId) {
		Object[] objArray = new Object[] { lastFrameNumber, repeatingRequestId };
		Message msg = getHandler().obtainMessage(REPEATING_REQUEST_ERROR,
		/arg1/ (int) (lastFrameNumber & 0xFFFFFFFFL),
		/arg2/ (int) ( (lastFrameNumber >> 32) & 0xFFFFFFFFL));
		/obj/ objArray);
		getHandler().sendMessage(msg);
		}

		@@ -329,9 +329,10 @@ public class CameraDeviceUserShim implements ICameraDeviceUser {
		break;
		}
		case REPEATING_REQUEST_ERROR: {
		long lastFrameNumber = msg.arg2 & 0xFFFFFFFFL;
		lastFrameNumber = (lastFrameNumber << 32) \| (msg.arg1 & 0xFFFFFFFFL);
		mCallbacks.onRepeatingRequestError(lastFrameNumber);
		Object[] objArray = (Object[]) msg.obj;
		long lastFrameNumber = (Long) objArray[0];
		int repeatingRequestId = (Integer) objArray[1];
		mCallbacks.onRepeatingRequestError(lastFrameNumber, repeatingRequestId);
		break;
		}
		case REQUEST_QUEUE_EMPTY: {