Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0b63007 authored by Jacky Kao's avatar Jacky Kao
Browse files

Make A11yServiceConnection PendingIntent immutable. 

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
parent 3e89574d

services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

        }