Prevent monkey from changing adoptable storage settings

Bug: 22423188 Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
2015-07-23 10:47:40 -07:00
parent d9e0ed1b3e
commit c1bef7430e
2 changed files with 6 additions and 2 deletions
--- 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());