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

Commit 29faa496 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "StorageManagerService: fix names of user lifecycle methods" into main... 

Merge "StorageManagerService: fix names of user lifecycle methods" into main am: 07615e30 am: 843bb557

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2762526



Change-Id: I75c649095eff86ab50dbe6972d82f60f9aad67c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48fd52ba 843bb557

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

+9 −9
Original line number Diff line number Diff line
@@ -262,17 +262,17 @@ class StorageManagerService extends IStorageManager.Stub 


        @Override

        public void onUserUnlocking(@NonNull TargetUser user) {

            mStorageManagerService.onUnlockUser(user.getUserIdentifier());

            mStorageManagerService.onUserUnlocking(user.getUserIdentifier());

        }



        @Override

        public void onUserStopped(@NonNull TargetUser user) {

            mStorageManagerService.onCleanupUser(user.getUserIdentifier());

            mStorageManagerService.onUserStopped(user.getUserIdentifier());

        }



        @Override

        public void onUserStopping(@NonNull TargetUser user) {

            mStorageManagerService.onStopUser(user.getUserIdentifier());

            mStorageManagerService.onUserStopping(user.getUserIdentifier());

        }



        @Override
@@ -1160,8 +1160,8 @@ class StorageManagerService extends IStorageManager.Stub 
        }

    }



    private void onUnlockUser(int userId) {

        Slog.d(TAG, "onUnlockUser " + userId);

    private void onUserUnlocking(int userId) {

        Slog.d(TAG, "onUserUnlocking " + userId);



        if (userId != UserHandle.USER_SYSTEM) {

            // Check if this user shares media with another user
@@ -1224,8 +1224,8 @@ class StorageManagerService extends IStorageManager.Stub 
        }

    }



    private void onCleanupUser(int userId) {

        Slog.d(TAG, "onCleanupUser " + userId);

    private void onUserStopped(int userId) {

        Slog.d(TAG, "onUserStopped " + userId);



        try {

            mVold.onUserStopped(userId);
@@ -1239,8 +1239,8 @@ class StorageManagerService extends IStorageManager.Stub 
        }

    }



    private void onStopUser(int userId) {

        Slog.i(TAG, "onStopUser " + userId);

    private void onUserStopping(int userId) {

        Slog.i(TAG, "onUserStopping " + userId);

        try {

            mStorageSessionController.onUserStopping(userId);

        } catch (Exception e) {