Merge "Marking @SystemApi permissions @hide too." into nyc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
441da79d8a
@@ -104,7 +104,6 @@ package android {
|
||||
field public static final java.lang.String READ_VOICEMAIL = "com.android.voicemail.permission.READ_VOICEMAIL";
|
||||
field public static final java.lang.String REBOOT = "android.permission.REBOOT";
|
||||
field public static final java.lang.String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED";
|
||||
field public static final java.lang.String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST";
|
||||
field public static final java.lang.String RECEIVE_MMS = "android.permission.RECEIVE_MMS";
|
||||
field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS";
|
||||
field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
|
||||
@@ -115,7 +114,6 @@ package android {
|
||||
field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
|
||||
field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
|
||||
field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
|
||||
field public static final java.lang.String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";
|
||||
field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";
|
||||
field public static final java.lang.String SET_ALWAYS_FINISH = "android.permission.SET_ALWAYS_FINISH";
|
||||
field public static final java.lang.String SET_ANIMATION_SCALE = "android.permission.SET_ANIMATION_SCALE";
|
||||
@@ -32974,7 +32972,6 @@ package android.provider {
|
||||
field public static final java.lang.String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL";
|
||||
field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED";
|
||||
field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";
|
||||
field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";
|
||||
field public static final java.lang.String SMS_RECEIVED_ACTION = "android.provider.Telephony.SMS_RECEIVED";
|
||||
field public static final java.lang.String SMS_REJECTED_ACTION = "android.provider.Telephony.SMS_REJECTED";
|
||||
field public static final java.lang.String SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION = "android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED";
|
||||
|
||||
@@ -368,6 +368,10 @@ package android.provider {
|
||||
field public static final java.lang.String VOLUME_VOICE = "volume_voice";
|
||||
}
|
||||
|
||||
public static final class Telephony.Sms.Intents {
|
||||
field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
package android.test.mock {
|
||||
|
||||
@@ -35674,7 +35674,6 @@ package android.provider {
|
||||
field public static final java.lang.String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL";
|
||||
field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED";
|
||||
field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";
|
||||
field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";
|
||||
field public static final java.lang.String SMS_RECEIVED_ACTION = "android.provider.Telephony.SMS_RECEIVED";
|
||||
field public static final java.lang.String SMS_REJECTED_ACTION = "android.provider.Telephony.SMS_REJECTED";
|
||||
field public static final java.lang.String SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION = "android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED";
|
||||
|
||||
@@ -366,6 +366,10 @@ package android.provider {
|
||||
field public static final java.lang.String VOLUME_VOICE = "volume_voice";
|
||||
}
|
||||
|
||||
public static final class Telephony.Sms.Intents {
|
||||
field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
package android.test.mock {
|
||||
|
||||
@@ -104,7 +104,6 @@ package android {
|
||||
field public static final java.lang.String READ_VOICEMAIL = "com.android.voicemail.permission.READ_VOICEMAIL";
|
||||
field public static final java.lang.String REBOOT = "android.permission.REBOOT";
|
||||
field public static final java.lang.String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED";
|
||||
field public static final java.lang.String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST";
|
||||
field public static final java.lang.String RECEIVE_MMS = "android.permission.RECEIVE_MMS";
|
||||
field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS";
|
||||
field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
|
||||
@@ -115,7 +114,6 @@ package android {
|
||||
field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
|
||||
field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
|
||||
field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
|
||||
field public static final java.lang.String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";
|
||||
field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";
|
||||
field public static final java.lang.String SET_ALWAYS_FINISH = "android.permission.SET_ALWAYS_FINISH";
|
||||
field public static final java.lang.String SET_ANIMATION_SCALE = "android.permission.SET_ANIMATION_SCALE";
|
||||
@@ -33049,7 +33047,6 @@ package android.provider {
|
||||
field public static final java.lang.String SMS_CARRIER_PROVISION_ACTION = "android.provider.Telephony.SMS_CARRIER_PROVISION";
|
||||
field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED";
|
||||
field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";
|
||||
field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";
|
||||
field public static final java.lang.String SMS_RECEIVED_ACTION = "android.provider.Telephony.SMS_RECEIVED";
|
||||
field public static final java.lang.String SMS_REJECTED_ACTION = "android.provider.Telephony.SMS_REJECTED";
|
||||
field public static final java.lang.String SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION = "android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED";
|
||||
|
||||
@@ -368,6 +368,10 @@ package android.provider {
|
||||
field public static final java.lang.String VOLUME_VOICE = "volume_voice";
|
||||
}
|
||||
|
||||
public static final class Telephony.Sms.Intents {
|
||||
field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
package android.test.mock {
|
||||
|
||||
@@ -1023,7 +1023,8 @@
|
||||
android:protectionLevel="signature|privileged" />
|
||||
|
||||
<!-- @SystemApi Allows an application to send SMS to premium shortcodes without user permission.
|
||||
<p>Not for use by third-party applications. -->
|
||||
<p>Not for use by third-party applications.
|
||||
@hide -->
|
||||
<permission android:name="android.permission.SEND_SMS_NO_CONFIRMATION"
|
||||
android:protectionLevel="signature|privileged" />
|
||||
|
||||
@@ -1034,7 +1035,8 @@
|
||||
|
||||
<!-- @SystemApi Allows an application to receive emergency cell broadcast messages,
|
||||
to record or display them to the user.
|
||||
<p>Not for use by third-party applications. -->
|
||||
<p>Not for use by third-party applications.
|
||||
@hide -->
|
||||
<permission android:name="android.permission.RECEIVE_EMERGENCY_BROADCAST"
|
||||
android:protectionLevel="signature|privileged" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user