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

Commit 8f3b5981 authored by Wei Wang's avatar Wei Wang
Browse files

Address API council review comments. 

Bug: 123587501
Test: Manual

Change-Id: I52ac67181b26dd27a5ab39253d8b26b1f99f2968
parent d7e834e5

src/com/android/packageinstaller/permission/model/AppPermissionGroup.java

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> 
        // the controller package itself.

        if (LocationUtils.isLocationGroupAndControllerExtraPackage(

                mContext, mName, mPackageInfo.packageName)) {

            return LocationUtils.isLocationControllerExtraPackageEnabled(mContext);

            return LocationUtils.isExtraLocationControllerPackageEnabled(mContext);

        }

        final int permissionCount = mPermissions.size();

        for (int i = 0; i < permissionCount; i++) {

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

+2 −2
Original line number Diff line number Diff line
@@ -420,8 +420,8 @@ public class LocationAccessCheck { 


                    LocationManager locationManager = getSystemServiceSafe(mContext,

                            LocationManager.class, pkg.user);

                    if (locationManager.isLocationControllerExtraPackageEnabled() && pkg.pkg.equals(

                            locationManager.getLocationControllerExtraPackage())) {

                    if (locationManager.isExtraLocationControllerPackageEnabled() && pkg.pkg.equals(

                            locationManager.getExtraLocationControllerPackage())) {

                        packageToNotifyFor = pkg;

                        break;

                    }

src/com/android/packageinstaller/permission/utils/LocationUtils.java

+4 −3
Original line number Diff line number Diff line
@@ -80,13 +80,14 @@ public class LocationUtils { 
            @NonNull String groupName, @NonNull String packageName) {

        return LOCATION_PERMISSION.equals(groupName)

                && packageName.equals(context.getSystemService(LocationManager.class)

                        .getLocationControllerExtraPackage());

                        .getExtraLocationControllerPackage());

    }



    public static boolean isLocationControllerExtraPackageEnabled(Context context) {

    /** Returns whether the location controller extra package is enabled. */

    public static boolean isExtraLocationControllerPackageEnabled(Context context) {

        try {

            return context.getSystemService(LocationManager.class)

                    .isLocationControllerExtraPackageEnabled();

                    .isExtraLocationControllerPackageEnabled();

        } catch (Exception e) {

            return false;

        }