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

Commit 509428e9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Resolve boot unaware for suspension details activity"

parents a452be9d fcca8a83

core/java/com/android/internal/app/SuspendedAppActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.app;



import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;

import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;

import static android.content.res.Resources.ID_NULL;



import android.Manifest;
@@ -64,7 +66,8 @@ public class SuspendedAppActivity extends AlertActivity 
        final Intent moreDetailsIntent = new Intent(Intent.ACTION_SHOW_SUSPENDED_APP_DETAILS)

                .setPackage(suspendingPackage);

        final String requiredPermission = Manifest.permission.SEND_SHOW_SUSPENDED_APP_DETAILS;

        final ResolveInfo resolvedInfo = mPm.resolveActivityAsUser(moreDetailsIntent, 0, userId);

        final ResolveInfo resolvedInfo = mPm.resolveActivityAsUser(moreDetailsIntent,

                MATCH_DIRECT_BOOT_UNAWARE | MATCH_DIRECT_BOOT_AWARE, userId);

        if (resolvedInfo != null && resolvedInfo.activityInfo != null

                && requiredPermission.equals(resolvedInfo.activityInfo.permission)) {

            moreDetailsIntent.putExtra(Intent.EXTRA_PACKAGE_NAME, suspendedPackage)