commit 9ade08733fe0ffa6ac97e480facfe230dacfe53c
author Amith Yamasani <yamasani@google.com> Tue Jul 21 21:43:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 21 21:43:57 2015 +0000
tree b54c87d5d7c66b0e77e8000476d0a8344b09528a
parent 3ad6585cbd05121e4eab1030f4c9d2a5f21f0397
parent f8db3c64984de6c2220578d4c9c12570c3d752b8

am f8db3c64: am aef8716e: am b82c71a8: am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev

* commit 'f8db3c64984de6c2220578d4c9c12570c3d752b8':
  Don't kill apps that are multi-user aware...

services/core/java/com/android/server/audio/AudioService.java

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 517e627..4c1db72 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -5121,6 +5121,11 @@
             if (UserHandle.getAppId(pkg.applicationInfo.uid) < FIRST_APPLICATION_UID) {
                 continue;
             }
+            // Skip packages that have permission to interact across users
+            if (pm.checkPermission(Manifest.permission.INTERACT_ACROSS_USERS, pkg.packageName)
+                    == PackageManager.PERMISSION_GRANTED) {
+                continue;
+            }
             if (homeActivityName != null
                     && pkg.packageName.equals(homeActivityName.getPackageName())
                     && pkg.applicationInfo.isSystemApp()) {