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

Commit 3bc45737 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "add NonNull and Nullable annotation to APIs" am: c931e9b0 

am: 715c2d87

Change-Id: I0c9f9cea0afaf221506906b79c18b562caba355f
parents 85021725 715c2d87

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -37318,7 +37318,7 @@ package android.provider { 
  }















  public static final class Telephony.CarrierId implements android.provider.BaseColumns {













    method public static android.net.Uri getPreciseCarrierIdUriForSubscriptionId(int);













    method @NonNull public static android.net.Uri getPreciseCarrierIdUriForSubscriptionId(int);















    method public static android.net.Uri getUriForSubscriptionId(int);















    field public static final String CARRIER_ID = "carrier_id";















    field public static final String CARRIER_NAME = "carrier_name";

























api/system-current.txt



+8
−8




























Original line number
Diff line number
Diff line








@@ -6107,7 +6107,7 @@ package android.telephony {













    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onCallDisconnectCauseChanged(int, int);















    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);















    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onPreciseCallStateChanged(@NonNull android.telephony.PreciseCallState);













    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState);













    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);















    method public void onRadioPowerStateChanged(int);















    method public void onSrvccStateChanged(int);















    method public void onVoiceActivationStateChanged(int);










@@ -6142,7 +6142,7 @@ package android.telephony {



























  public final class PreciseDataConnectionState implements android.os.Parcelable {















    method public int describeContents();













    method public String getDataConnectionApn();













    method @Nullable public String getDataConnectionApn();















    method public int getDataConnectionApnTypeBitMask();















    method public int getDataConnectionFailCause();















    method public int getDataConnectionState();










@@ -6296,17 +6296,17 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultDataSubId(int);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultSmsSubId(int);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean);













    field public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;













    field @NonNull public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;















    field public static final int PROFILE_CLASS_DEFAULT = -1; // 0xffffffff















    field public static final int PROFILE_CLASS_OPERATIONAL = 2; // 0x2















    field public static final int PROFILE_CLASS_PROVISIONING = 1; // 0x1















    field public static final int PROFILE_CLASS_TESTING = 0; // 0x0















    field public static final int PROFILE_CLASS_UNSET = -1; // 0xffffffff













    field public static final android.net.Uri VT_ENABLED_CONTENT_URI;













    field public static final android.net.Uri WFC_ENABLED_CONTENT_URI;













    field public static final android.net.Uri WFC_MODE_CONTENT_URI;













    field public static final android.net.Uri WFC_ROAMING_ENABLED_CONTENT_URI;













    field public static final android.net.Uri WFC_ROAMING_MODE_CONTENT_URI;













    field @NonNull public static final android.net.Uri VT_ENABLED_CONTENT_URI;













    field @NonNull public static final android.net.Uri WFC_ENABLED_CONTENT_URI;













    field @NonNull public static final android.net.Uri WFC_MODE_CONTENT_URI;













    field @NonNull public static final android.net.Uri WFC_ROAMING_ENABLED_CONTENT_URI;













    field @NonNull public static final android.net.Uri WFC_ROAMING_MODE_CONTENT_URI;















  }





























  public static class SubscriptionPlan.Builder {

































services/core/java/com/android/server/TelephonyRegistry.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -1454,7 +1454,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {













        synchronized (mRecords) {















            mPreciseDataConnectionState = new PreciseDataConnectionState(















                    TelephonyManager.DATA_UNKNOWN,TelephonyManager.NETWORK_TYPE_UNKNOWN,













                    ApnSetting.getApnTypesBitmaskFromString(apnType), "", null,













                    ApnSetting.getApnTypesBitmaskFromString(apnType), null, null,















                    DataFailCause.NONE);















            for (Record r : mRecords) {















                if (r.matchPhoneStateListenerEvent(









@@ -1470,7 +1470,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {













        }















        broadcastDataConnectionFailed(apnType, subId);















        broadcastPreciseDataConnectionStateChanged(TelephonyManager.DATA_UNKNOWN,













                TelephonyManager.NETWORK_TYPE_UNKNOWN, apnType, "", null,













                TelephonyManager.NETWORK_TYPE_UNKNOWN, apnType, null, null,















                DataFailCause.NONE);















    }

















































telephony/java/android/provider/Telephony.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.provider;































import android.annotation.IntDef;













import android.annotation.NonNull;















import android.annotation.RequiresPermission;















import android.annotation.SdkConstant;















import android.annotation.SdkConstant.SdkConstantType;










@@ -4277,6 +4278,7 @@ public final class Telephony {













         * @param subscriptionId the subscriptionId to receive updates on















         * @return the Uri used to observe precise carrier identity changes















         */













        @NonNull















        public static Uri getPreciseCarrierIdUriForSubscriptionId(int subscriptionId) {















            return Uri.withAppendedPath(Uri.withAppendedPath(CONTENT_URI, "precise"),















                    String.valueOf(subscriptionId));

































telephony/java/android/telephony/PhoneStateListener.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -606,7 +606,7 @@ public class PhoneStateListener {













    @RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))















    @SystemApi















    public void onPreciseDataConnectionStateChanged(













            PreciseDataConnectionState dataConnectionState) {













            @NonNull PreciseDataConnectionState dataConnectionState) {















        // default implementation empty















    }