提交: bb88f40e63dfc70fe9c55bbbb4d862ef9a597399 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修订版: bb88f40e63dfc70fe9c55bbbb4d862ef9a597399 (tree)
• 时间: 2019-06-05 18:28:50
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Android 8.1.0 release 65
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXPGt0wAKCRDorT+BmrEO
eNMWAJ0fCbr6PkgB37eIdjeJJQ8UJFl4/ACfcr84dSoP8d+FIZ/m28nLkOmKhvY=
=x4n2
-----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r65' into oreo-x86

Android 8.1.0 release 65

更改概述

• modified: services/core/java/com/android/server/notification/NotificationManagerService.java
• modified: services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

差异

--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1767,6 +1767,11 @@ public class NotificationManagerService extends SystemService {
         @Override
         public boolean areNotificationsEnabledForPackage(String pkg, int uid) {
             checkCallerIsSystemOrSameApp(pkg);
+            if (UserHandle.getCallingUserId() != UserHandle.getUserId(uid)) {
+                getContext().enforceCallingPermission(
+                        android.Manifest.permission.INTERACT_ACROSS_USERS,
+                        "canNotifyAsPackage for uid " + uid);
+            }
 
             return mRankingHelper.getImportance(pkg, uid) != IMPORTANCE_NONE;
         }

--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7801,6 +7801,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
         if (!mHasFeature) {
             return null;
         }
+        enforceManageUsers();
         synchronized (this) {
             List<String> result = null;
             // If we have multiple profiles we return the intersection of the