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

Commit f810cc9a authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Fix uri permission grant on remote bug report uri"

parents 63bfc831 7226c7dc

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

+2 −2
Original line number Diff line number Diff line
@@ -377,7 +377,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.
@@ -385,7 +385,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 {@code DevicePolicyManagerService}.

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

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

import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.AlarmManager;

import android.app.AppGlobals;

import android.app.IActivityManager;
@@ -6151,8 +6152,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) {