From c1bef7430e1c49b9c3b2312328d3600261109ee8 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Thu, 23 Jul 2015 10:47:40 -0700 Subject: [PATCH] Prevent monkey from changing adoptable storage settings Bug: 22423188 Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b --- src/com/android/settings/deviceinfo/PublicVolumeSettings.java | 4 +++- src/com/android/settings/deviceinfo/StorageWizardInit.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index 4c77d217b7d..c9b4beb3250 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.net.Uri; @@ -81,7 +82,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 284e67d6d6e..c3c24305e47 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(); setIllustrationInternal(true); setHeaderText(R.string.storage_wizard_init_title, mDisk.getDescription());