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...

1 files changed, 5 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 517e627ff1ba..4c1db721210e 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 @@ public class AudioService extends IAudioService.Stub {
             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()) {