diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index cb0fe0efd3b..e5ac9fe30d9 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; +import android.app.ActivityManager; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -85,7 +86,8 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { final Context context = getActivity(); - mIsPermittedToAdopt = UserManager.get(context).isAdminUser(); + mIsPermittedToAdopt = UserManager.get(context).isAdminUser() + && !ActivityManager.isUserAMonkey(); mStorageManager = context.getSystemService(StorageManager.class); diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java index da54da661f0..ffc07e520f3 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardInit.java +++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; +import android.app.ActivityManager; import android.content.Intent; import android.os.Bundle; import android.os.UserManager; @@ -42,7 +43,8 @@ public class StorageWizardInit extends StorageWizardBase { } setContentView(R.layout.storage_wizard_init); - mIsPermittedToAdopt = UserManager.get(this).isAdminUser(); + mIsPermittedToAdopt = UserManager.get(this).isAdminUser() + && !ActivityManager.isUserAMonkey(); setIllustrationType(ILLUSTRATION_SETUP); setHeaderText(R.string.storage_wizard_init_title, mDisk.getDescription());