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

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

Merge "Modify ManagePermissionActivity to take in a permission not a group."

parents bcb9a078 87faa85b

src/com/android/packageinstaller/permission/service/LocationAccessCheck.java

+1 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import static com.android.packageinstaller.Constants.PERIODIC_LOCATION_ACCESS_CH 
import static com.android.packageinstaller.Constants.PERMISSION_REMINDER_CHANNEL_ID;

import static com.android.packageinstaller.Constants.PREFERENCES_FILE;

import static com.android.packageinstaller.permission.utils.Utils.OS_PKG;

import static com.android.packageinstaller.permission.utils.Utils.getGroupOfPlatformPermission;

import static com.android.packageinstaller.permission.utils.Utils.getParcelableExtraSafe;

import static com.android.packageinstaller.permission.utils.Utils.getStringExtraSafe;

import static com.android.packageinstaller.permission.utils.Utils.getSystemServiceSafe;
@@ -837,8 +836,7 @@ public class LocationAccessCheck { 


            Intent manageAppPermission = new Intent(context, AppPermissionActivity.class);

            manageAppPermission.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_MULTIPLE_TASK);

            manageAppPermission.putExtra(EXTRA_PERMISSION_NAME,

                    getGroupOfPlatformPermission(ACCESS_FINE_LOCATION));

            manageAppPermission.putExtra(EXTRA_PERMISSION_NAME, ACCESS_FINE_LOCATION);

            manageAppPermission.putExtra(EXTRA_PACKAGE_NAME, pkg);

            manageAppPermission.putExtra(EXTRA_USER, user);

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

+5 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import androidx.fragment.app.FragmentActivity; 
import com.android.packageinstaller.DeviceUtils;

import com.android.packageinstaller.permission.ui.handheld.AppPermissionFragment;

import com.android.packageinstaller.permission.utils.LocationUtils;

import com.android.packageinstaller.permission.utils.Utils;



/**

 * Manage a single permission of a single app
@@ -56,6 +57,7 @@ public final class AppPermissionActivity extends FragmentActivity { 
            finish();

            return;

        }

        String groupName = Utils.getGroupOfPlatformPermission(permissionName);



        UserHandle userHandle = getIntent().getParcelableExtra(Intent.EXTRA_USER);

        if (userHandle == null) {
@@ -64,7 +66,7 @@ public final class AppPermissionActivity extends FragmentActivity { 
            return;

        }



        if (LocationUtils.isLocationGroupAndProvider(this, permissionName,

        if (LocationUtils.isLocationGroupAndProvider(this, groupName,

                packageName)) {

            Intent intent = new Intent(this, LocationProviderInterceptDialog.class);

            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);
@@ -74,14 +76,14 @@ public final class AppPermissionActivity extends FragmentActivity { 
        }



        if (LocationUtils.isLocationGroupAndControllerExtraPackage(

                this, permissionName, packageName)) {

                this, groupName, packageName)) {

            // Redirect to location controller extra package settings.

            LocationUtils.startLocationControllerExtraPackageSettings(this);

            finish();

            return;

        }



        Fragment androidXFragment = AppPermissionFragment.newInstance(packageName, permissionName,

        Fragment androidXFragment = AppPermissionFragment.newInstance(packageName, groupName,

                userHandle);



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

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

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

     */

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

            @NonNull String permissionName, @NonNull UserHandle userHandle) {

            @NonNull String groupName, @NonNull UserHandle userHandle) {

        AppPermissionFragment fragment = new AppPermissionFragment();

        Bundle arguments = new Bundle();

        arguments.putString(Intent.EXTRA_PACKAGE_NAME, packageName);

        arguments.putString(Intent.EXTRA_PERMISSION_NAME, permissionName);

        arguments.putString(Intent.EXTRA_PERMISSION_GROUP_NAME, groupName);

        arguments.putParcelable(Intent.EXTRA_USER, userHandle);

        fragment.setArguments(arguments);

        return fragment;
@@ -145,7 +145,7 @@ public class AppPermissionFragment extends SettingsWithLargeHeader { 
        Context context = getPreferenceManager().getContext();



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

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

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

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class PermissionControlPreference extends Preference { 
        setOnPreferenceClickListener(preference -> {

            Intent intent = new Intent(context, AppPermissionActivity.class);

            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, group.getApp().packageName);

            intent.putExtra(Intent.EXTRA_PERMISSION_NAME, group.getName());

            intent.putExtra(Intent.EXTRA_PERMISSION_NAME, group.getPermissions().get(0).getName());

            intent.putExtra(Intent.EXTRA_USER, group.getUser());

            context.startActivity(intent);

            return true;