OSDN Git Service

Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275...
authorBrad Ebinger <breadley@google.com>
Wed, 1 Feb 2017 19:46:55 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Feb 2017 19:46:55 +0000 (19:46 +0000)
commite3482c2601fd025002377d47389be97bbc0c892d
tree58632ec5675587c8fe411e0475e8594fa633c36c
parent7985f418714bffdde43e04211130835b050f06bf
parent3aaf673c60377fdff72fe1ab17099083f5fe9622
Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275c2f am: fa1dca0ad6
am: 3aaf673c60

Change-Id: I6a6a2d136f0f31bbac984e4ba18f9f6b90808705
core/java/android/content/pm/IPackageManager.aidl
services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
services/core/java/com/android/server/pm/PackageManagerService.java