am db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev

* commit 'db56efe685d249e1e0e415b3e5b2086b5c2c205c': Fix to check the incoming userid argument for RingtonePlayer
2015-08-14 18:47:04 +00:00
parent 13845aeae3 db56efe685
commit c81daf7ff1
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java
+++ b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java
@@ -159,7 +159,9 @@ public class RingtonePlayer extends SystemUI {
            if (Binder.getCallingUid() != Process.SYSTEM_UID) {
                throw new SecurityException("Async playback only available from system UID.");
            }
-
+            if (UserHandle.ALL.equals(user)) {
+                user = UserHandle.OWNER;
+            }
            mAsyncPlayer.play(getContextForUser(user), uri, looping, aa);
        }