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

Revert [Telephony mainline] Add SystemApi and NonNull annotation

Browse Source 
Reason: Revisit and redesign in S

Bug: 147390517
Test: make
Change-Id: I0749492a5648dfa2fb83271f349a8370972f7032
Merged-In: I0749492a5648dfa2fb83271f349a8370972f7032
(cherry picked from commit 2d280f1bb4)
This commit is contained in:
zoey chen
2020-03-09 16:18:44 +08:00
committed by Zoey Chen
parent 261e944b0f
commit 7cb5ca8e7d
2 changed files with 15 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/system-current.txt
View File

@@ -9067,18 +9067,6 @@ package android.printservice.recommendation {
package android.provider {
public class BlockedNumberContract {
field public static final String METHOD_NOTIFY_EMERGENCY_CONTACT = "notify_emergency_contact";
field public static final String METHOD_SHOULD_SYSTEM_BLOCK_NUMBER = "should_system_block_number";
field public static final String RES_BLOCK_STATUS = "block_status";
field public static final int STATUS_BLOCKED_IN_LIST = 1; // 0x1
field public static final int STATUS_BLOCKED_NOT_IN_CONTACTS = 5; // 0x5
field public static final int STATUS_BLOCKED_PAYPHONE = 4; // 0x4
field public static final int STATUS_BLOCKED_RESTRICTED = 2; // 0x2
field public static final int STATUS_BLOCKED_UNKNOWN_NUMBER = 3; // 0x3
field public static final int STATUS_NOT_BLOCKED = 0; // 0x0
}
@Deprecated public static final class ContactsContract.MetadataSync implements android.provider.BaseColumns android.provider.ContactsContract.MetadataSyncColumns {
field @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_metadata";
field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contact_metadata";

48
core/java/android/provider/BlockedNumberContract.java
View File

@@ -16,7 +16,6 @@
package android.provider;
import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.annotation.WorkerThread;
import android.content.Context;
import android.net.Uri;
@@ -240,7 +239,6 @@ public class BlockedNumberContract {
* blocked.
* @hide
*/
@SystemApi
public static final int STATUS_NOT_BLOCKED = 0;
/**
@@ -248,7 +246,6 @@ public class BlockedNumberContract {
* because it is in the list of blocked numbers maintained by the provider.
* @hide
*/
@SystemApi
public static final int STATUS_BLOCKED_IN_LIST = 1;
/**
@@ -256,7 +253,6 @@ public class BlockedNumberContract {
* because it is from a restricted number.
* @hide
*/
@SystemApi
public static final int STATUS_BLOCKED_RESTRICTED = 2;
/**
@@ -264,7 +260,6 @@ public class BlockedNumberContract {
* because it is from an unknown number.
* @hide
*/
@SystemApi
public static final int STATUS_BLOCKED_UNKNOWN_NUMBER = 3;
/**
@@ -272,7 +267,6 @@ public class BlockedNumberContract {
* because it is from a pay phone.
* @hide
*/
@SystemApi
public static final int STATUS_BLOCKED_PAYPHONE = 4;
/**
@@ -280,14 +274,12 @@ public class BlockedNumberContract {
* because it is from a number not in the users contacts.
* @hide
*/
@SystemApi
public static final int STATUS_BLOCKED_NOT_IN_CONTACTS = 5;
/**
* Integer reason indicating whether a call was blocked, and if so why.
* @hide
*/
@SystemApi
public static final String RES_BLOCK_STATUS = "block_status";
/** @hide */
@@ -297,31 +289,6 @@ public class BlockedNumberContract {
public static final String METHOD_CAN_CURRENT_USER_BLOCK_NUMBERS =
"can_current_user_block_numbers";
/** @hide */
@SystemApi
public static final String METHOD_NOTIFY_EMERGENCY_CONTACT = "notify_emergency_contact";
/** @hide */
public static final String METHOD_END_BLOCK_SUPPRESSION = "end_block_suppression";
/** @hide */
@SystemApi
public static final String METHOD_SHOULD_SYSTEM_BLOCK_NUMBER = "should_system_block_number";
/** @hide */
public static final String METHOD_GET_BLOCK_SUPPRESSION_STATUS =
"get_block_suppression_status";
/** @hide */
public static final String METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION =
"should_show_emergency_call_notification";
/** @hide */
public static final String METHOD_GET_ENHANCED_BLOCK_SETTING = "get_enhanced_block_setting";
/** @hide */
public static final String METHOD_SET_ENHANCED_BLOCK_SETTING = "set_enhanced_block_setting";
/** @hide */
public static final String RES_CAN_BLOCK_NUMBERS = "can_block";
@@ -439,11 +406,26 @@ public class BlockedNumberContract {
public static final String ACTION_BLOCK_SUPPRESSION_STATE_CHANGED =
"android.provider.action.BLOCK_SUPPRESSION_STATE_CHANGED";
public static final String METHOD_NOTIFY_EMERGENCY_CONTACT = "notify_emergency_contact";
public static final String METHOD_END_BLOCK_SUPPRESSION = "end_block_suppression";
public static final String METHOD_SHOULD_SYSTEM_BLOCK_NUMBER = "should_system_block_number";
public static final String METHOD_GET_BLOCK_SUPPRESSION_STATUS =
"get_block_suppression_status";
public static final String METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION =
"should_show_emergency_call_notification";
public static final String RES_IS_BLOCKING_SUPPRESSED = "blocking_suppressed";
public static final String RES_BLOCKING_SUPPRESSED_UNTIL_TIMESTAMP =
"blocking_suppressed_until_timestamp";
public static final String METHOD_GET_ENHANCED_BLOCK_SETTING = "get_enhanced_block_setting";
public static final String METHOD_SET_ENHANCED_BLOCK_SETTING = "set_enhanced_block_setting";
/* Preference key of block numbers not in contacts setting. */
public static final String ENHANCED_SETTING_KEY_BLOCK_UNREGISTERED =
"block_numbers_not_in_contacts_setting";