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

* commit '89d4131d75cc4c89e3fb36115be929837c9a3171':
  Don't kill apps that are multi-user aware...
This commit is contained in:
Amith Yamasani
2015-07-21 20:33:07 +00:00
committed by Android Git Automerger

View File

@@ -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()) {