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

Commit 3cf2b049 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Dmitry Dementyev
Browse files

Force-set a ClipData to prevent later migration. 

migrateExtraStreamToClipData() will only offer to promote Uri values
if a ClipData isn't already defined, so we ensure that a ClipData
value is always defined.  This blocks later promotion and granting.

Bug: 200683077
Bug: 123700107
Test: manual
Change-Id: I99c1411e8b4eb01eb27ac4306e3bf6cc88cb4273
(cherry picked from commit 6ebf410b)
parent 8bcd86e6

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;
@@ -4759,6 +4760,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