Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 266e17f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update docs and add nullability annotations" am: 9c0f722e am:... 

Merge "Update docs and add nullability annotations" am: 9c0f722e am: c7898c93 am: 3f75fdeb am: f8cb55df

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455141

Change-Id: I4f401cc7d5ae71a95ccd47fe2f42a939875b7dcb
parents e8324397 f8cb55df

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -48467,7 +48467,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();
@@ -48490,7 +48490,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);

non-updatable-api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -46601,7 +46601,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();
@@ -46624,7 +46624,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);

telephony/java/android/telephony/TelephonyManager.java

+9 −3
Original line number Diff line number Diff line
@@ -10397,19 +10397,25 @@ public class TelephonyManager { 
     * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges})

     * and {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}.

     *

     * May return {@code null} when the subscription is inactive or when there was an error

     * communicating with the phone process.

     */

    @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges

    @RequiresPermission(allOf = {

            Manifest.permission.READ_PHONE_STATE,

            Manifest.permission.ACCESS_COARSE_LOCATION

    })

    public ServiceState getServiceState() {

    public @Nullable ServiceState getServiceState() {

        return getServiceStateForSubscriber(getSubId());

    }















    /**















     * Returns the service state information on specified subscription. Callers require















     * either READ_PRIVILEGED_PHONE_STATE or READ_PHONE_STATE to retrieve the information.













     *













     * May return {@code null} when the subscription is inactive or when there was an error













     * communicating with the phone process.















     * @hide















     */















    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)









@@ -10436,9 +10442,9 @@ public class TelephonyManager {













     * @param accountHandle The handle for the {@link PhoneAccount} for which to retrieve the















     * voicemail ringtone.















     * @return The URI for the ringtone to play when receiving a voicemail from a specific













     * PhoneAccount.













     * PhoneAccount. May be {@code null} if no ringtone is set.















     */













    public Uri getVoicemailRingtoneUri(PhoneAccountHandle accountHandle) {













    public @Nullable Uri getVoicemailRingtoneUri(PhoneAccountHandle accountHandle) {















        try {















            ITelephony service = getITelephony();















            if (service != null) {