Merge "Restrict MANAGE_DEVICE_ADMIN permissions to signature"
This commit is contained in:
committed by
Android (Google) Code Review
commit
c2bca7b745
@@ -94,7 +94,6 @@ package android {
|
||||
field public static final java.lang.String MANAGE_CONTENT_CAPTURE = "android.permission.MANAGE_CONTENT_CAPTURE";
|
||||
field public static final java.lang.String MANAGE_CONTENT_SUGGESTIONS = "android.permission.MANAGE_CONTENT_SUGGESTIONS";
|
||||
field public static final java.lang.String MANAGE_DEBUGGING = "android.permission.MANAGE_DEBUGGING";
|
||||
field public static final java.lang.String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";
|
||||
field public static final java.lang.String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS";
|
||||
field public static final java.lang.String MANAGE_ROLE_HOLDERS = "android.permission.MANAGE_ROLE_HOLDERS";
|
||||
field public static final java.lang.String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
package android {
|
||||
|
||||
public static final class Manifest.permission {
|
||||
field public static final java.lang.String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
package android.app {
|
||||
|
||||
public class Notification implements android.os.Parcelable {
|
||||
|
||||
@@ -3196,9 +3196,10 @@
|
||||
|
||||
<!-- @SystemApi Required to add or remove another application as a device admin.
|
||||
<p>Not for use by third-party applications.
|
||||
@hide -->
|
||||
@hide
|
||||
@removed -->
|
||||
<permission android:name="android.permission.MANAGE_DEVICE_ADMINS"
|
||||
android:protectionLevel="signature|privileged" />
|
||||
android:protectionLevel="signature" />
|
||||
|
||||
<!-- @SystemApi Allows an app to reset the device password.
|
||||
<p>Not for use by third-party applications.
|
||||
|
||||
Reference in New Issue
Block a user