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

Commit 427e8edc authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 0c8dcf4d: am c037282c: Merge "Rebind notification listeners for current user." into jb-mr2-dev 

* commit '0c8dcf4d':
  Rebind notification listeners for current user.
parents 759c085b 0c8dcf4d

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -537,13 +537,14 @@ public class NotificationManagerService extends INotificationManager.Stub 
     * is altered. (For example in response to USER_SWITCHED in our broadcast receiver)

     * is altered. (For example in response to USER_SWITCHED in our broadcast receiver)

     */

     */

    void rebindListenerServices() {

    void rebindListenerServices() {

        String flat = Settings.Secure.getString(

        final int currentUser = ActivityManager.getCurrentUser();

        String flat = Settings.Secure.getStringForUser(

                mContext.getContentResolver(),

                mContext.getContentResolver(),

                Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);

                Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,

                currentUser);





        NotificationListenerInfo[] toRemove = new NotificationListenerInfo[mListeners.size()];

        NotificationListenerInfo[] toRemove = new NotificationListenerInfo[mListeners.size()];

        final ArrayList<ComponentName> toAdd;

        final ArrayList<ComponentName> toAdd;

        final int currentUser = ActivityManager.getCurrentUser();





        synchronized (mNotificationList) {

        synchronized (mNotificationList) {

            // unbind and remove all existing listeners

            // unbind and remove all existing listeners