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

Commit d446e110 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Automerger Merge Worker
Browse files

Merge "Force-set a ClipData to prevent later migration." into pi-dev am: d5c2fb38 am: 8e8fbc89 

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

Change-Id: Ic19f454deaa9ef8bb9a176c1879fc2570dd5d5ac
parents cc70d98e 8e8fbc89

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;
@@ -4782,6 +4783,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