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

Commit 64726cb4 authored by Zim's avatar Zim Committed by Martijn Coenen
Browse files

Only remountUid when uid is active 

StorageManagerService may get appops or permission change callbacks
requiring it to remount the storage volumes for a certain uid.

Now, we ignore this expensive call for uids without any active processes

Test: Logs show many calls being ignored
Bug: 141678467

Change-Id: I66e28d0e4107f6eb6abda78eb59039549b7bc670
parent 0f2b7fd2

services/core/java/com/android/server/StorageManagerService.java

+9 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.Manifest.permission.INSTALL_PACKAGES; 
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;

import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;

import static android.Manifest.permission.WRITE_MEDIA_STORAGE;

import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;

import static android.app.AppOpsManager.MODE_ALLOWED;

import static android.app.AppOpsManager.OP_LEGACY_STORAGE;

import static android.app.AppOpsManager.OP_READ_EXTERNAL_STORAGE;
@@ -49,6 +50,7 @@ import static org.xmlpull.v1.XmlPullParser.START_TAG; 
import android.Manifest;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.AppOpsManager;

import android.app.IActivityManager;

import android.app.KeyguardManager;
@@ -3379,7 +3381,13 @@ class StorageManagerService extends IStorageManager.Stub 
        public void opChanged(int op, int uid, String packageName) throws RemoteException {

            if (!ENABLE_ISOLATED_STORAGE) return;



            remountUidExternalStorage(uid, getMountMode(uid, packageName));

            int mountMode = getMountMode(uid, packageName);

            boolean isUidActive = LocalServices.getService(ActivityManagerInternal.class)

                    .getUidProcessState(uid) != PROCESS_STATE_NONEXISTENT;



            if (isUidActive) {

                remountUidExternalStorage(uid, mountMode);

            }

        }

    };