diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-18 20:03:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-18 20:03:33 +0000 |
| commit | b38ef3467bfb1caae80b4699d000b7fd17a94ae0 (patch) | |
| tree | 44cfe3f87b1f9b57fd18de5ded5ecfe170078c4d /src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java | |
| parent | 7636a42bacc32c7f8df3ae1e686ae0c5857a25ba (diff) | |
| parent | 6dc9e5007de25dd9dd8fd6ebc42d9322069a9a38 (diff) | |
| download | android_packages_apps_PackageInstaller-b38ef3467bfb1caae80b4699d000b7fd17a94ae0.tar.gz android_packages_apps_PackageInstaller-b38ef3467bfb1caae80b4699d000b7fd17a94ae0.tar.bz2 android_packages_apps_PackageInstaller-b38ef3467bfb1caae80b4699d000b7fd17a94ae0.zip | |
Merge "Link from location permission to settings for loc providers" into mnc-dev
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java | 5 |
1 files changed, 5 insertions, 0 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 { |