commit e8a930427dba2ed30f0c4629634aa84543121165
author Jeff Sharkey <jsharkey@android.com> Fri Apr 13 10:42:37 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 13 10:42:37 2012 -0700
tree 545b458ecbcfd47d301fb55af2c445e8efdfd139
parent 9ad9cf646e164b46d9ec698c9ff4469e4a95904a
parent 78a534af1b4045cdda2b21c49d1bb50c4f329d86

Merge "Handle READ_EXTERNAL enforced by default."

src/com/android/settings/deviceinfo/Memory.java

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 999449a..d0eef62 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -17,8 +17,6 @@
 package com.android.settings.deviceinfo;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
-import static android.content.pm.PackageManager.ENFORCEMENT_DEFAULT;
-import static android.content.pm.PackageManager.ENFORCEMENT_YES;
 
 import android.app.ActivityThread;
 import android.app.AlertDialog;
@@ -180,15 +178,15 @@
         final MenuItem usb = menu.findItem(R.id.storage_usb);
         usb.setVisible(!isMassStorageEnabled());
 
-        final int enforcement;
+        final boolean enforced;
         try {
-            enforcement = mPackageService.getPermissionEnforcement(READ_EXTERNAL_STORAGE);
+            enforced = mPackageService.isPermissionEnforced(READ_EXTERNAL_STORAGE);
         } catch (RemoteException e) {
             throw new RuntimeException("Problem talking with PackageManager", e);
         }
 
         final MenuItem enforceReadExternal = menu.findItem(R.id.storage_enforce_read_external);
-        enforceReadExternal.setChecked(enforcement == ENFORCEMENT_YES);
+        enforceReadExternal.setChecked(enforced);
     }
 
     @Override
@@ -209,10 +207,9 @@
                 final boolean checked = !item.isChecked();
                 item.setChecked(checked);
 
-                final int enforcement = checked ? ENFORCEMENT_YES : ENFORCEMENT_DEFAULT;
                 try {
                     // TODO: offload to background thread
-                    mPackageService.setPermissionEnforcement(READ_EXTERNAL_STORAGE, enforcement);
+                    mPackageService.setPermissionEnforced(READ_EXTERNAL_STORAGE, checked);
                 } catch (RemoteException e) {
                     throw new RuntimeException("Problem talking with PackageManager", e);
                 }