2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 231a7c4b..7b2de19a 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -29,6 +29,7 @@ import android.os.UserHandle;
 import android.util.ArrayMap;
 
 import com.android.packageinstaller.R;
+import com.android.packageinstaller.permission.utils.LocationUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -250,6 +251,9 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
     }
 
     public boolean areRuntimePermissionsGranted() {
+        if (LocationUtils.isLocked(mName, mPackageInfo.packageName)) {
+            return LocationUtils.isLocationEnabled(mContext);
+        }
         final int permissionCount = mPermissions.size();
         for (int i = 0; i < permissionCount; i++) {
             Permission permission = mPermissions.valueAt(i);
diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java
index dfb8c8cc..4a71010a 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionApps.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java
@@ -70,6 +70,10 @@ public class PermissionApps {
         loadGroupInfo();
     }
 
+    public String getGroupName() {
+        return mGroupName;
+    }
+
     public void loadNowWithoutUi() {
         mSkipUi = true;
         createMap(loadPermissionApps());