Snap for 11914274 from 0fe5d8c80d114375df0363e9446f9a489c30b7b8 to 24Q3-release (14820847) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -14435,6 +14435,7 @@ package android.telephony {
		method @NonNull public android.telephony.CarrierRestrictionRules build();
		method @NonNull public android.telephony.CarrierRestrictionRules.Builder setAllCarriersAllowed();
		method @NonNull public android.telephony.CarrierRestrictionRules.Builder setAllowedCarriers(@NonNull java.util.List<android.service.carrier.CarrierIdentifier>);
		method @FlaggedApi("com.android.internal.telephony.flags.set_carrier_restriction_status") @NonNull public android.telephony.CarrierRestrictionRules.Builder setCarrierRestrictionStatus(int);
		method @NonNull public android.telephony.CarrierRestrictionRules.Builder setDefaultCarrierRestriction(int);
		method @NonNull public android.telephony.CarrierRestrictionRules.Builder setExcludedCarriers(@NonNull java.util.List<android.service.carrier.CarrierIdentifier>);
		method @NonNull public android.telephony.CarrierRestrictionRules.Builder setMultiSimPolicy(int);

core/java/android/accessibilityservice/AccessibilityService.java

+97 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.accessibilityservice;

		import static android.accessibilityservice.AccessibilityServiceInfo.CAPABILITY_CAN_CONTROL_MAGNIFICATION;
		import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;
		import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY;

		@@ -69,6 +70,8 @@ import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
		import android.view.accessibility.AccessibilityWindowInfo;
		import android.view.inputmethod.EditorInfo;

		import androidx.annotation.GuardedBy;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.inputmethod.CancellationGroup;
		import com.android.internal.inputmethod.IAccessibilityInputMethodSession;
		@@ -640,6 +643,8 @@ public abstract class AccessibilityService extends Service {
		/** The detected gesture information for different displays */
		boolean onGesture(AccessibilityGestureEvent gestureInfo);
		boolean onKeyEvent(KeyEvent event);
		/** Magnification SystemUI connection changed callbacks */
		void onMagnificationSystemUIConnectionChanged(boolean connected);
		/** Magnification changed callbacks for different displays */
		void onMagnificationChanged(int displayId, @NonNull Region region,
		MagnificationConfig config);
		@@ -790,7 +795,6 @@ public abstract class AccessibilityService extends Service {
		public static final String KEY_ACCESSIBILITY_SCREENSHOT_TIMESTAMP =
		"screenshot_timestamp";


		/**
		* Annotations for result codes of attaching accessibility overlays.
		*
		@@ -837,6 +841,13 @@ public abstract class AccessibilityService extends Service {

		private WindowManager mWindowManager;

		@GuardedBy("mLock")
		private boolean mServiceConnected;
		@GuardedBy("mLock")
		private boolean mMagnificationSystemUIConnected;
		@GuardedBy("mLock")
		private boolean mServiceConnectedNotified;

		/** List of magnification controllers, mapping from displayId -> MagnificationController. */
		private final SparseArray<MagnificationController> mMagnificationControllers =
		new SparseArray<>(0);
		@@ -886,11 +897,14 @@ public abstract class AccessibilityService extends Service {
		for (int i = 0; i < mMagnificationControllers.size(); i++) {
		mMagnificationControllers.valueAt(i).onServiceConnectedLocked();
		}
		checkIsMagnificationSystemUIConnectedAlready();
		final AccessibilityServiceInfo info = getServiceInfo();
		if (info != null) {
		updateInputMethod(info);
		mMotionEventSources = info.getMotionEventSources();
		}
		mServiceConnected = true;
		mServiceConnectedNotified = false;
		}
		if (mSoftKeyboardController != null) {
		mSoftKeyboardController.onServiceConnected();
		@@ -898,8 +912,58 @@ public abstract class AccessibilityService extends Service {

		// The client gets to handle service connection last, after we've set
		// up any state upon which their code may rely.
		if (android.view.accessibility.Flags
		.waitMagnificationSystemUiConnectionToNotifyServiceConnected()) {
		notifyOnServiceConnectedIfReady();
		} else {
		onServiceConnected();
		}
		}

		private void notifyOnServiceConnectedIfReady() {
		synchronized (mLock) {
		if (mServiceConnectedNotified) {
		return;
		}
		boolean canControlMagnification;
		final AccessibilityServiceInfo info = getServiceInfo();
		if (info != null) {
		int flagMask = CAPABILITY_CAN_CONTROL_MAGNIFICATION;
		canControlMagnification = (info.getCapabilities() & flagMask) == flagMask;
		} else {
		canControlMagnification = false;
		}
		boolean ready = canControlMagnification
		? (mServiceConnected && mMagnificationSystemUIConnected)
		: mServiceConnected;
		if (ready) {
		getMainExecutor().execute(() -> onServiceConnected());
		mServiceConnectedNotified = true;
		}
		}
		}

		@GuardedBy("mLock")
		private void checkIsMagnificationSystemUIConnectedAlready() {
		if (!android.view.accessibility.Flags
		.waitMagnificationSystemUiConnectionToNotifyServiceConnected()) {
		return;
		}
		if (mMagnificationSystemUIConnected) {
		return;
		}
		final IAccessibilityServiceConnection connection =
		AccessibilityInteractionClient.getInstance(this).getConnection(mConnectionId);
		if (connection != null) {
		try {
		boolean connected = connection.isMagnificationSystemUIConnected();
		mMagnificationSystemUIConnected = connected;
		} catch (RemoteException re) {
		Log.w(LOG_TAG, "Failed to check magnification system ui connection", re);
		re.rethrowFromSystemServer();
		}
		}
		}

		private void updateInputMethod(AccessibilityServiceInfo info) {
		if (info != null) {
		@@ -1360,6 +1424,22 @@ public abstract class AccessibilityService extends Service {
		}
		}

		private void onMagnificationSystemUIConnectionChanged(boolean connected) {
		if (!android.view.accessibility.Flags
		.waitMagnificationSystemUiConnectionToNotifyServiceConnected()) {
		return;
		}

		synchronized (mLock) {
		boolean changed = (mMagnificationSystemUIConnected != connected);
		mMagnificationSystemUIConnected = connected;

		if (changed) {
		notifyOnServiceConnectedIfReady();
		}
		}
		}

		private void onMagnificationChanged(int displayId, @NonNull Region region,
		MagnificationConfig config) {
		MagnificationController controller;
		@@ -2822,6 +2902,11 @@ public abstract class AccessibilityService extends Service {
		return AccessibilityService.this.onKeyEvent(event);
		}

		@Override
		public void onMagnificationSystemUIConnectionChanged(boolean connected) {
		AccessibilityService.this.onMagnificationSystemUIConnectionChanged(connected);
		}

		@Override
		public void onMagnificationChanged(int displayId, @NonNull Region region,
		MagnificationConfig config) {
		@@ -3032,6 +3117,16 @@ public abstract class AccessibilityService extends Service {
		});
		}

		@Override
		public void onMagnificationSystemUIConnectionChanged(boolean connected) {
		mExecutor.execute(() -> {
		if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
		mCallback.onMagnificationSystemUIConnectionChanged(connected);
		}
		return;
		});
		}

		/** Magnification changed callbacks for different displays */
		public void onMagnificationChanged(int displayId, @NonNull Region region,
		MagnificationConfig config) {

core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ import com.android.internal.inputmethod.IRemoteAccessibilityInputConnection;

		void onKeyEvent(in KeyEvent event, int sequence);

		void onMagnificationSystemUIConnectionChanged(boolean connected);

		void onMagnificationChanged(int displayId, in Region region, in MagnificationConfig config);

		void onMotionEvent(in MotionEvent event);

core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,9 @@ interface IAccessibilityServiceConnection {
		@RequiresNoPermission
		void setMagnificationCallbackEnabled(int displayId, boolean enabled);

		@RequiresNoPermission
		boolean isMagnificationSystemUIConnected();

		@RequiresNoPermission
		boolean setSoftKeyboardShowMode(int showMode);

core/java/android/app/ActivityThread.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -355,7 +355,7 @@ public final class ActivityThread extends ClientTransactionHandler

		private static final String DEFAULT_FULL_BACKUP_AGENT = "android.app.backup.FullBackupAgent";

		private static final long BINDER_CALLBACK_THROTTLE_MS = 10_100L;
		private static final long BINDER_CALLBACK_THROTTLE = 10_100L;
		private long mBinderCallbackLast = -1;

		/**
		@@ -7551,13 +7551,12 @@ public final class ActivityThread extends ClientTransactionHandler
		@Override
		public void onTransactionError(int pid, int code, int flags, int err) {
		final long now = SystemClock.uptimeMillis();
		if (now < mBinderCallbackLast + BINDER_CALLBACK_THROTTLE_MS) {
		if (now < mBinderCallbackLast + BINDER_CALLBACK_THROTTLE) {
		Slog.d(TAG, "Too many transaction errors, throttling freezer binder callback.");
		return;
		}
		mBinderCallbackLast = now;
		try {
		Log.wtfStack(TAG, "Binder Transaction Error");
		mgr.frozenBinderTransactionDetected(pid, code, flags, err);
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();