diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-07-21 20:04:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-21 20:04:22 +0000 |
| commit | 09ba71513ba3bb092eb3effbe45953c50430ff20 (patch) | |
| tree | a75fd8e0fc6a88d483cf324fb67a94436c10a083 /services | |
| parent | 5d586dd585a6663290b68abce433a75b5760fc5d (diff) | |
| parent | c1cbaaba6c509a0e31cbed843f77af1eae1cb064 (diff) | |
| download | frameworks_base-09ba71513ba3bb092eb3effbe45953c50430ff20.zip frameworks_base-09ba71513ba3bb092eb3effbe45953c50430ff20.tar.gz frameworks_base-09ba71513ba3bb092eb3effbe45953c50430ff20.tar.bz2 | |
Merge "Don't kill apps that are multi-user aware..." into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 5 |
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 eef3d63..1223a00 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -5126,6 +5126,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()) { |