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

am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings

Browse Source 
* commit '402c866c3117571ddb66614fdbf963e8564a3232':
  Prevent monkey from changing adoptable storage settings
This commit is contained in:
Guang Zhu
2015-07-24 03:03:26 +00:00
committed by Android Git Automerger
parent a20eaca1a6 402c866c31
commit b91da24db7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/deviceinfo/PublicVolumeSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo; package com.android.settings.deviceinfo;
import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
@@ -81,7 +82,8 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
final Context context = getActivity(); final Context context = getActivity();
mIsPermittedToAdopt = UserManager.get(context).isAdminUser(); mIsPermittedToAdopt = UserManager.get(context).isAdminUser()
&& !ActivityManager.isUserAMonkey();
mStorageManager = context.getSystemService(StorageManager.class); mStorageManager = context.getSystemService(StorageManager.class);

4
src/com/android/settings/deviceinfo/StorageWizardInit.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo; package com.android.settings.deviceinfo;
import android.app.ActivityManager;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserManager; import android.os.UserManager;
@@ -42,7 +43,8 @@ public class StorageWizardInit extends StorageWizardBase {
} }
setContentView(R.layout.storage_wizard_init); setContentView(R.layout.storage_wizard_init);
mIsPermittedToAdopt = UserManager.get(this).isAdminUser(); mIsPermittedToAdopt = UserManager.get(this).isAdminUser()
&& !ActivityManager.isUserAMonkey();
setIllustrationInternal(true); setIllustrationInternal(true);
setHeaderText(R.string.storage_wizard_init_title, mDisk.getDescription()); setHeaderText(R.string.storage_wizard_init_title, mDisk.getDescription());