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

Commit e64ffe3e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Force-set a ClipData to prevent later migration." into rvc-dev... 

Merge "Merge "Force-set a ClipData to prevent later migration." into rvc-dev am: 56495051 am: 6fa9586c" into rvc-d1-dev-plus-aosp am: d5a57666

Change-Id: I6f75daf1fdeded22cc71e956f439935a26d2a0c1
parents cf392bda d5a57666

services/core/java/com/android/server/accounts/AccountManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.app.admin.DeviceAdminInfo; 
import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManagerInternal;

import android.content.BroadcastReceiver;

import android.content.ClipData;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -4757,6 +4758,11 @@ public class AccountManagerService 
         * supplied entries in the system Settings app.

         */

         protected boolean checkKeyIntent(int authUid, Intent intent) {

            // Explicitly set an empty ClipData to ensure that we don't offer to

            // promote any Uris contained inside for granting purposes

            if (intent.getClipData() == null) {

                intent.setClipData(ClipData.newPlainText(null, null));

            }

            intent.setFlags(intent.getFlags() & ~(Intent.FLAG_GRANT_READ_URI_PERMISSION

                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION

                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION