PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cda0663e: Merge "Enforce READ_EXTERNAL in Developer Options." into jb-dev

Browse Source 
* commit 'cda0663eb9c3a324c543c504647c7661f2ac7b35':
  Enforce READ_EXTERNAL in Developer Options.
This commit is contained in:
Jeff Sharkey
2012-05-15 11:41:54 -07:00
committed by Android Git Automerger
parent 3beaff9641 cda0663eb9
commit cc62db8040
5 changed files with 99 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/deviceinfo/Memory.java
View File

@@ -16,9 +16,6 @@
package com.android.settings.deviceinfo;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import android.app.ActivityThread;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.BroadcastReceiver;
@@ -26,7 +23,6 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.IPackageManager;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.Environment;
@@ -68,7 +64,6 @@ public class Memory extends SettingsPreferenceFragment {
private IMountService mMountService = null;
private StorageManager mStorageManager = null;
private IPackageManager mPackageService;
private StorageVolumePreferenceCategory mInternalStorageVolumePreferenceCategory;
private StorageVolumePreferenceCategory[] mStorageVolumePreferenceCategories;
@@ -82,8 +77,6 @@ public class Memory extends SettingsPreferenceFragment {
mStorageManager.registerListener(mStorageListener);
}
mPackageService = ActivityThread.getPackageManager();
addPreferencesFromResource(R.xml.device_info_memory);
mResources = getResources();
@@ -178,16 +171,6 @@ public class Memory extends SettingsPreferenceFragment {
public void onPrepareOptionsMenu(Menu menu) {
final MenuItem usb = menu.findItem(R.id.storage_usb);
usb.setVisible(!isMassStorageEnabled());
final boolean enforced;
try {
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(enforced);
}
@Override
@@ -204,18 +187,6 @@ public class Memory extends SettingsPreferenceFragment {
startFragment(this, UsbSettings.class.getCanonicalName(), -1, null);
}
return true;
case R.id.storage_enforce_read_external: {
final boolean checked = !item.isChecked();
item.setChecked(checked);
try {
// TODO: offload to background thread
mPackageService.setPermissionEnforced(READ_EXTERNAL_STORAGE, checked);
} catch (RemoteException e) {
throw new RuntimeException("Problem talking with PackageManager", e);
}
return true;
}
}
return super.onOptionsItemSelected(item);
}