Merge "Make A11yServiceConnection PendingIntent immutable." into rvc-dev am: b7b425e491 am: 8aee100ab4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818825

Change-Id: I3bf163a23d86e675141f4c7314636454fef8a33f
This commit is contained in:
TreeHugger Robot
2020-06-12 20:02:03 +00:00
committed by Automerger Merge Worker

View File

@@ -21,6 +21,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa
import android.Manifest; import android.Manifest;
import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.AccessibilityServiceInfo;
import android.accessibilityservice.IAccessibilityServiceClient; import android.accessibilityservice.IAccessibilityServiceClient;
import android.app.PendingIntent;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -83,7 +84,8 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect
final long identity = Binder.clearCallingIdentity(); final long identity = Binder.clearCallingIdentity();
try { try {
mIntent.putExtra(Intent.EXTRA_CLIENT_INTENT, mSystemSupport.getPendingIntentActivity( mIntent.putExtra(Intent.EXTRA_CLIENT_INTENT, mSystemSupport.getPendingIntentActivity(
mContext, 0, new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS), 0)); mContext, 0, new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS),
PendingIntent.FLAG_IMMUTABLE));
} finally { } finally {
Binder.restoreCallingIdentity(identity); Binder.restoreCallingIdentity(identity);
} }