Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1bef743 authored by Guang Zhu's avatar Guang Zhu
Browse files

Prevent monkey from changing adoptable storage settings 

Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
parent d9e0ed1b

src/com/android/settings/deviceinfo/PublicVolumeSettings.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/deviceinfo/StorageWizardInit.java

+3 −1
Original line number Diff line number Diff line
@@ -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());