Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make A11yServiceConnection PendingIntent immutable.

Browse Source 
Require that the PendingIntent be immutable so that a malicious app is
not able to hijack and mutate any of the details.

Bug: 154913130
Test: a11y CTS & unit tests
Change-Id: Ib794fa9e80b2a6c5562c66a0c17ea7c92c500e19
(cherry picked from commit a0b630075a)
This commit is contained in:
Jacky Kao
2020-06-04 15:18:49 +08:00
parent 11b5847397
commit 39e7cdc2b9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
View File

@@ -21,6 +21,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa
import android.Manifest;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accessibilityservice.IAccessibilityServiceClient;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -83,7 +84,8 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect
final long identity = Binder.clearCallingIdentity();
try {
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 {
Binder.restoreCallingIdentity(identity);
}