summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2020-10-12 11:44:30 -0700
committerHall Liu <hallliu@google.com>2020-10-12 11:47:50 -0700
commit1dc684e4fc2ac276e2b6902c602f43b872dc5c7f (patch)
tree494fd3e2a787dd7cdc23de22f58dfc8554ef2e98 /api
parenta35917822d67a86956f626a3d5b868f274677f0b (diff)
Update docs and add nullability annotations
Fixes: 125463584 Test: docs only Change-Id: I8c39d0e11278d99c6a7364c09b0584797f749b2a
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 27a035e3474a..66f2340b1ca1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -48279,7 +48279,7 @@ package android.telephony {
method @Deprecated public int getPhoneCount();
method public int getPhoneType();
method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();
- method @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public android.telephony.ServiceState getServiceState();
+ method @Nullable @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public android.telephony.ServiceState getServiceState();
method @Nullable public android.telephony.SignalStrength getSignalStrength();
method public int getSimCarrierId();
method @Nullable public CharSequence getSimCarrierIdName();
@@ -48302,7 +48302,7 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailAlphaTag();
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailNumber();
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getVoiceNetworkType();
- method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
+ method @Nullable public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
method public boolean hasCarrierPrivileges();
method public boolean hasIccCard();
method @Deprecated public boolean iccCloseLogicalChannel(int);