From 78a534af1b4045cdda2b21c49d1bb50c4f329d86 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 12 Apr 2012 15:58:57 -0700 Subject: [PATCH] Handle READ_EXTERNAL enforced by default. Bug: 6131916 Change-Id: Icbdaf6c7febfb8f93992a1f32732d104c8c1848c --- src/com/android/settings/deviceinfo/Memory.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java index 999449a4719..d0eef62f023 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 @@ public class Memory extends SettingsPreferenceFragment { 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 @@ public class Memory extends SettingsPreferenceFragment { 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); }