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

Commit f85a2070 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:... 

Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e802 am: 824c8284
am: 72074e3a

Change-Id: I1cd4db65e0fe8c92628f22f94fe937cf64f2da04
parents 5659b15a 72074e3a

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ public class DevicePolicyManager { 
     * @hide

     */

    public static final String ACTION_BUGREPORT_SHARING_ACCEPTED =

            "com.android.server.action.BUGREPORT_SHARING_ACCEPTED";

            "com.android.server.action.REMOTE_BUGREPORT_SHARING_ACCEPTED";



    /**

     * Action: Bugreport sharing with device owner has been declined by the user.
@@ -368,7 +368,7 @@ public class DevicePolicyManager { 
     * @hide

     */

    public static final String ACTION_BUGREPORT_SHARING_DECLINED =

            "com.android.server.action.BUGREPORT_SHARING_DECLINED";

            "com.android.server.action.REMOTE_BUGREPORT_SHARING_DECLINED";



    /**

     * Action: Bugreport has been collected and is dispatched to {@link DevicePolicyManagerService}.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.annotation.Nullable; 
import android.annotation.UserIdInt;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.ActivityManagerNative;

import android.app.AlarmManager;

import android.app.AppGlobals;
@@ -5677,8 +5678,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                intent.setComponent(mOwners.getDeviceOwnerComponent());

                intent.setDataAndType(bugreportUri, RemoteBugreportUtils.BUGREPORT_MIMETYPE);

                intent.putExtra(DeviceAdminReceiver.EXTRA_BUGREPORT_HASH, bugreportHash);

                mContext.grantUriPermission(mOwners.getDeviceOwnerComponent().getPackageName(),

                        bugreportUri, Intent.FLAG_GRANT_READ_URI_PERMISSION);

                intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);



                LocalServices.getService(ActivityManagerInternal.class)

                        .grantUriPermissionFromIntent(Process.SHELL_UID,

                                mOwners.getDeviceOwnerComponent().getPackageName(),

                                intent, mOwners.getDeviceOwnerUserId());

                mContext.sendBroadcastAsUser(intent, UserHandle.of(mOwners.getDeviceOwnerUserId()));

            }

        } catch (FileNotFoundException e) {