diff options
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java | 5 | ||||
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java index e83641f1..b08e8f98 100644 --- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java @@ -51,6 +51,7 @@ import android.widget.Toast; import com.android.packageinstaller.R; import com.android.packageinstaller.permission.model.AppPermissionGroup; import com.android.packageinstaller.permission.model.AppPermissions; +import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.permission.utils.Utils; @@ -278,6 +279,10 @@ public final class AppPermissionsFragment extends SettingsWithHeader addToggledGroup(group); + if (LocationUtils.isLocked(group.getName(), group.getApp().packageName)) { + LocationUtils.showLocationDialog(getContext(), group.getLabel()); + return false; + } if (newValue == Boolean.TRUE) { group.grantRuntimePermissions(false); } else { diff --git a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java index f4c271fc..7aacdc94 100644 --- a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java @@ -46,6 +46,7 @@ import com.android.packageinstaller.permission.model.AppPermissionGroup; import com.android.packageinstaller.permission.model.PermissionApps; import com.android.packageinstaller.permission.model.PermissionApps.Callback; import com.android.packageinstaller.permission.model.PermissionApps.PermissionApp; +import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.permission.utils.Utils; @@ -218,9 +219,13 @@ public final class PermissionAppsFragment extends PreferenceFragment implements String pkg = preference.getKey(); final PermissionApp app = mPermissionApps.getApp(pkg); + if (app == null) { + return false; + } addToggledGroup(app.getPackageName(), app.getPermissionGroup()); - if (app == null) { + if (LocationUtils.isLocked(mPermissionApps.getGroupName(), app.getPackageName())) { + LocationUtils.showLocationDialog(getContext(), app.getLabel()); return false; } if (newValue == Boolean.TRUE) { |