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

Commit b572ae58 authored by Evan Severson's avatar Evan Severson
Browse files

Do not crash the permission controller on activity start 

When an app targeting R sdk requests both foreground and background
permission the entire permission controller process shouldn't crash.
This also changes it so that these apps recieve the permission denied
result instead of crashing

Test: Manual
Fixes: 155881548
Change-Id: I022f021c3115519f4c44f7bed0e6c6295e4990bb
parent 97aaeaf9

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

+2 −1
Original line number Diff line number Diff line
@@ -392,9 +392,10 @@ public class GrantPermissionsActivity extends Activity 
                if (mAppPermissions.getPackageInfo().applicationInfo.targetSdkVersion

                        >= Build.VERSION_CODES.R && mRequestedPermissions.length > 1

                        && group.isBackgroundGroup()) {

                    throw new SecurityException("Apps targeting " + Build.VERSION_CODES.R + " must"

                    Log.e(LOG_TAG, "Apps targeting " + Build.VERSION_CODES.R + " must"

                            + " have foreground permission before requesting background and must"

                            + " request background on its own.");

                    finish();

                }



                addRequestedPermissions(group, affectedPermissions.get(i), icicle == null);