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

Commit 867644c1 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am cafd061a: am f864401c: Merge changes I00665385,Ic76db232 into jb-mr1-dev 

* commit 'cafd061a':
  Send accessibility notification events only for the current user.
  No sound produced on global actions dialog pops up if no vibrator is present.
parents e6153ee3 cafd061a

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −0
Original line number Diff line number Diff line
@@ -4302,6 +4302,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    public boolean performHapticFeedbackLw(WindowState win, int effectId, boolean always) {

        if (!mVibrator.hasVibrator()) {

            return false;

        }

        final boolean hapticsDisabled = Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.HAPTIC_FEEDBACK_ENABLED, 0, UserHandle.USER_CURRENT) == 0;

        if (!always && (hapticsDisabled || mKeyguardMediator.isShowingAndNotHidden())) {

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

+12 −9
Original line number Diff line number Diff line
@@ -991,6 +991,14 @@ public class NotificationManagerService extends INotificationManager.Stub 
                        | Notification.FLAG_NO_CLEAR;

            }



            final int currentUser;

            final long token = Binder.clearCallingIdentity();

            try {

                currentUser = ActivityManager.getCurrentUser();

            } finally {

                Binder.restoreCallingIdentity(token);

            }



            if (notification.icon != 0) {

                final StatusBarNotification n = new StatusBarNotification(

                        pkg, id, tag, r.uid, r.initialPid, score, notification, user);
@@ -1015,7 +1023,10 @@ public class NotificationManagerService extends INotificationManager.Stub 
                        Binder.restoreCallingIdentity(identity);

                    }

                }

                // Send accessibility events only for the current user.

                if (currentUser == userId) {

                    sendAccessibilityEvent(notification, pkg);

                }

            } else {

                Slog.e(TAG, "Ignoring notification with icon==0: " + notification);

                if (old != null && old.statusBarKey != null) {
@@ -1029,14 +1040,6 @@ public class NotificationManagerService extends INotificationManager.Stub 
                }

            }



            final int currentUser;

            final long token = Binder.clearCallingIdentity();

            try {

                currentUser = ActivityManager.getCurrentUser();

            } finally {

                Binder.restoreCallingIdentity(token);

            }



            // If we're not supposed to beep, vibrate, etc. then don't.

            if (((mDisabledNotifications & StatusBarManager.DISABLE_NOTIFICATION_ALERTS) == 0)

                    && (!(old != null