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

Commit 459888d8 authored by Joel Galenson's avatar Joel Galenson
Browse files

Fix a bug that broke changing platform permissions. 

Fixes: 131233884
Test: Change platform and non-platform permissions from AppPermissions
and PermissionAppsFragment.

Change-Id: I86c8b0fb447e4d88699137369751308f56e1cf1f
parent edf00ca3

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

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ public final class AppPermissionActivity extends FragmentActivity { 
            return;

        }



        Fragment androidXFragment = AppPermissionFragment.newInstance(packageName, groupName,

                userHandle);

        Fragment androidXFragment = AppPermissionFragment.newInstance(packageName, permissionName,

                groupName, userHandle);



        getSupportFragmentManager().beginTransaction().replace(android.R.id.content,

                    androidXFragment).commit();

src/com/android/packageinstaller/permission/ui/handheld/AppPermissionFragment.java

+9 −2
Original line number Diff line number Diff line
@@ -110,11 +110,15 @@ public class AppPermissionFragment extends SettingsWithLargeHeader { 
     * @return A new fragment

     */

    public static @NonNull AppPermissionFragment newInstance(@NonNull String packageName,

            @NonNull String groupName, @NonNull UserHandle userHandle) {

            @NonNull String permName, @Nullable String groupName, @NonNull UserHandle userHandle) {

        AppPermissionFragment fragment = new AppPermissionFragment();

        Bundle arguments = new Bundle();

        arguments.putString(Intent.EXTRA_PACKAGE_NAME, packageName);

        if (groupName == null) {

            arguments.putString(Intent.EXTRA_PERMISSION_NAME, permName);

        } else {

            arguments.putString(Intent.EXTRA_PERMISSION_GROUP_NAME, groupName);

        }

        arguments.putParcelable(Intent.EXTRA_USER, userHandle);

        fragment.setArguments(arguments);

        return fragment;
@@ -146,6 +150,9 @@ public class AppPermissionFragment extends SettingsWithLargeHeader { 


        String packageName = getArguments().getString(Intent.EXTRA_PACKAGE_NAME);

        String groupName = getArguments().getString(Intent.EXTRA_PERMISSION_GROUP_NAME);

        if (groupName == null) {

            groupName = getArguments().getString(Intent.EXTRA_PERMISSION_NAME);

        }

        PackageItemInfo groupInfo = Utils.getGroupInfo(groupName, context);

        List<PermissionInfo> groupPermInfos = Utils.getGroupPermissionInfos(groupName, context);

        if (groupInfo == null || groupPermInfos == null) {