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

Commit 028e8e3c authored by Svet Ganov's avatar Svet Ganov Committed by Svetoslav Ganov
Browse files

Fix a NPE in GrantPermissionsActivity 

We get an NPE if an app that delcates no permissions as used
requests runtime permissions.

bug:21011604

Change-Id: Id0cac6dcbd78ef849a1eafa522b8a06e61b21a1b
parent 8c73974b

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+6 −5
Original line number Diff line number Diff line
@@ -102,6 +102,12 @@ public class GrantPermissionsActivity extends OverlayTouchActivity 


        PackageInfo callingPackageInfo = getCallingPackageInfo();



        if (callingPackageInfo == null || callingPackageInfo.requestedPermissions == null

                || callingPackageInfo.requestedPermissions.length <= 0) {

            setResultAndFinish();

            return;

        }



        // Don't allow legacy apps to request runtime permissions.

        if (callingPackageInfo.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {

            // Returning empty arrays means a cancellation.
@@ -117,11 +123,6 @@ public class GrantPermissionsActivity extends OverlayTouchActivity 
        // If calling package is null we default to deny all.

        updateDefaultResults(callingPackageInfo, permissionPolicy);



        if (callingPackageInfo == null) {

            setResultAndFinish();

            return;

        }



        mAppPermissions = new AppPermissions(this, callingPackageInfo, null, false,

                new Runnable() {

                    @Override