Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '09ba71513ba3bb092eb3effbe45953c50430ff20':
  Don't kill apps that are multi-user aware...
This commit is contained in:
Amith Yamasani
2015-07-21 20:18:02 +00:00
committed by Android Git Automerger
parent a69e72c547 09ba71513b
commit 89d4131d75
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -5126,6 +5126,11 @@ public class AudioService extends IAudioService.Stub {
if (UserHandle.getAppId(pkg.applicationInfo.uid) < FIRST_APPLICATION_UID) { if (UserHandle.getAppId(pkg.applicationInfo.uid) < FIRST_APPLICATION_UID) {
continue; 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 if (homeActivityName != null
&& pkg.packageName.equals(homeActivityName.getPackageName()) && pkg.packageName.equals(homeActivityName.getPackageName())
&& pkg.applicationInfo.isSystemApp()) { && pkg.applicationInfo.isSystemApp()) {