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

Commit 33408f22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Selectively inform subservices about managed profiles"

parents f32d0d8a 4ff9749b

services/core/java/com/android/server/notification/NotificationManagerService.java

+25 −19
Original line number Diff line number Diff line
@@ -1152,15 +1152,18 @@ public class NotificationManagerService extends SystemService { 
                // turn off LED when user passes through lock screen

                mNotificationLight.turnOff();

            } else if (action.equals(Intent.ACTION_USER_SWITCHED)) {

                final int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);

                final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);

                mUserProfiles.updateCache(context);

                if (!mUserProfiles.isManagedProfile(userId)) {

                    // reload per-user settings

                    mSettingsObserver.update(null);

                mUserProfiles.updateCache(context);

                    // Refresh managed services

                mConditionProviders.onUserSwitched(user);

                mListeners.onUserSwitched(user);

                mAssistants.onUserSwitched(user);

                mZenModeHelper.onUserSwitched(user);

                    mConditionProviders.onUserSwitched(userId);

                    mListeners.onUserSwitched(userId);

                    mZenModeHelper.onUserSwitched(userId);

                }

                // assistant is the only thing that cares about managed profiles specifically

                mAssistants.onUserSwitched(userId);

            } else if (action.equals(Intent.ACTION_USER_ADDED)) {

                final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);

                if (userId != USER_NULL) {
@@ -1170,20 +1173,23 @@ public class NotificationManagerService extends SystemService { 
                    }

                }

            } else if (action.equals(Intent.ACTION_USER_REMOVED)) {

                final int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);

                final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);

                mUserProfiles.updateCache(context);

                mZenModeHelper.onUserRemoved(user);

                mPreferencesHelper.onUserRemoved(user);

                mListeners.onUserRemoved(user);

                mConditionProviders.onUserRemoved(user);

                mAssistants.onUserRemoved(user);

                mZenModeHelper.onUserRemoved(userId);

                mPreferencesHelper.onUserRemoved(userId);

                mListeners.onUserRemoved(userId);

                mConditionProviders.onUserRemoved(userId);

                mAssistants.onUserRemoved(userId);

                savePolicyFile();

            } else if (action.equals(Intent.ACTION_USER_UNLOCKED)) {

                final int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);

                mConditionProviders.onUserUnlocked(user);

                mListeners.onUserUnlocked(user);

                mAssistants.onUserUnlocked(user);

                mZenModeHelper.onUserUnlocked(user);

                final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL);

                mUserProfiles.updateCache(context);

                mAssistants.onUserUnlocked(userId);

                if (!mUserProfiles.isManagedProfile(userId)) {

                    mConditionProviders.onUserUnlocked(userId);

                    mListeners.onUserUnlocked(userId);

                    mZenModeHelper.onUserUnlocked(userId);

                }

            }

        }

    };

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ import android.os.IBinder; 
import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.MediaStore;

import android.provider.Settings.Secure;

import android.service.notification.Adjustment;