From 8165386bfecdf2c06e5da046fa190b0a340c70e8 Mon Sep 17 00:00:00 2001 From: chen xu Date: Thu, 28 Feb 2019 10:44:54 -0800 Subject: add NonNull and Nullable annotation to APIs Bug: 126699430 Bug: 126699963 Bug: 126700457 Bug: 126700771 Bug: 126702453 Bug: 123939479 Test: Build Change-Id: Ib429d2918e63f8d272fc7842b0abd83ffd5a9090 --- api/current.txt | 2 +- api/system-current.txt | 16 ++++++++-------- .../core/java/com/android/server/TelephonyRegistry.java | 4 ++-- telephony/java/android/provider/Telephony.java | 2 ++ telephony/java/android/telephony/PhoneStateListener.java | 2 +- .../android/telephony/PreciseDataConnectionState.java | 4 ++++ .../java/android/telephony/SubscriptionManager.java | 6 ++++++ 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index d9d61b5dbeed..71bd4596832f 100755 --- a/api/current.txt +++ b/api/current.txt @@ -37321,7 +37321,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"; diff --git a/api/system-current.txt b/api/system-current.txt index 7fcc6c0a924f..231912c06e9c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6099,7 +6099,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); @@ -6134,7 +6134,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(); @@ -6288,17 +6288,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 { diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index b4d45d475917..d8a54f7ce6a8 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -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); } diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index 21cc1a2171ff..1dadaeec2143 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -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)); diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java index da92730383d0..24319a230716 100644 --- a/telephony/java/android/telephony/PhoneStateListener.java +++ b/telephony/java/android/telephony/PhoneStateListener.java @@ -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 } diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index 57a18266259a..d59367821a5d 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -16,6 +16,8 @@ package android.telephony; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.net.LinkProperties; @@ -25,6 +27,7 @@ import android.telephony.data.ApnSetting; import java.util.Objects; + /** * Contains precise data connection state. * @@ -119,6 +122,7 @@ public final class PreciseDataConnectionState implements Parcelable { /** * Returns APN {@link ApnSetting} of this data connection. */ + @Nullable public String getDataConnectionApn() { return mAPN; } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 52cab556d11c..635e4fe92090 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -149,6 +149,7 @@ public class SubscriptionManager { * {@link Uri#withAppendedPath(Uri, String)}. * @hide */ + @NonNull @SystemApi public static final Uri WFC_ENABLED_CONTENT_URI = Uri.withAppendedPath(CONTENT_URI, "wfc"); @@ -167,6 +168,7 @@ public class SubscriptionManager { * {@link Uri#withAppendedPath(Uri, String)}. * @hide */ + @NonNull @SystemApi public static final Uri ADVANCED_CALLING_ENABLED_CONTENT_URI = Uri.withAppendedPath( CONTENT_URI, "advanced_calling"); @@ -184,6 +186,7 @@ public class SubscriptionManager { * {@link Uri#withAppendedPath(Uri, String)}. * @hide */ + @NonNull @SystemApi public static final Uri WFC_MODE_CONTENT_URI = Uri.withAppendedPath(CONTENT_URI, "wfc_mode"); @@ -200,6 +203,7 @@ public class SubscriptionManager { * {@link Uri#withAppendedPath(Uri, String)}. * @hide */ + @NonNull @SystemApi public static final Uri WFC_ROAMING_MODE_CONTENT_URI = Uri.withAppendedPath( CONTENT_URI, "wfc_roaming_mode"); @@ -218,6 +222,7 @@ public class SubscriptionManager { * {@link Uri#withAppendedPath(Uri, String)}. * @hide */ + @NonNull @SystemApi public static final Uri VT_ENABLED_CONTENT_URI = Uri.withAppendedPath( CONTENT_URI, "vt_enabled"); @@ -235,6 +240,7 @@ public class SubscriptionManager { * {@link Uri#withAppendedPath(Uri, String)}. * @hide */ + @NonNull @SystemApi public static final Uri WFC_ROAMING_ENABLED_CONTENT_URI = Uri.withAppendedPath( CONTENT_URI, "wfc_roaming_enabled"); -- cgit v1.2.3-59-g8ed1b