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

Merge "Fix Sysui crash on volume change." into nyc-dev

Browse Source 
am: 6e9151e

* commit '6e9151eae88035919c4af7a40a243a6410da9c16':
  Fix Sysui crash on volume change.
This commit is contained in:
Julia Reynolds
2016-03-22 20:59:46 +00:00
committed by android-build-merger
parent 676e973321 6e9151eae8
commit 68515252fa
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/AndroidManifest.xml
View File

@@ -156,6 +156,9 @@
<!-- TV picture-in-picture -->
<uses-permission android:name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE" />
<!-- DND access -->
<uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS" />
<application
android:name=".SystemUIApplication"
android:persistent="true"

11
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -1852,16 +1852,11 @@ public class NotificationManagerService extends SystemService {
}
private boolean checkPolicyAccess(String pkg) {
if (PackageManager.PERMISSION_GRANTED == getContext().checkCallingPermission(
android.Manifest.permission.MANAGE_NOTIFICATIONS)) {
if (PackageManager.PERMISSION_GRANTED == ActivityManager.checkComponentPermission(
android.Manifest.permission.MANAGE_NOTIFICATIONS, Binder.getCallingUid(),
-1, true)) {
return true;
}
if (mAudioManagerInternal != null) {
final int vcuid = mAudioManagerInternal.getVolumeControllerUid();
if (vcuid > 0 && Binder.getCallingUid() == vcuid) {
return true;
}
}
return checkPackagePolicyAccess(pkg) || mListeners.isComponentEnabledForPackage(pkg);
}