diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-12 22:09:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-12 22:09:38 +0000 |
| commit | 9c0f722e2eccdec98bf93f3aeb0a0e3e5b79c569 (patch) | |
| tree | 7dabcf5a24e4722b5e0a5e462c2c3eceef061e70 /api | |
| parent | d70fa4186002f301f3c242e765eb10905a084a15 (diff) | |
| parent | 1dc684e4fc2ac276e2b6902c602f43b872dc5c7f (diff) | |
Merge "Update docs and add nullability annotations"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 |
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); |