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

Commit b7b425e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make A11yServiceConnection PendingIntent immutable." into rvc-dev

parents f3e7dfe1 39e7cdc2

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

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

        }

        }