Merge "Add NonNull and Nullable annotations" am: 56bd70db86 am: 808b57db7f (5c76cae6) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -45563,7 +45563,7 @@ package android.telephony.euicc {
		}

		public class EuiccManager {
		method public android.telephony.euicc.EuiccManager createForCardId(int);
		method @NonNull public android.telephony.euicc.EuiccManager createForCardId(int);
		method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void deleteSubscription(int, android.app.PendingIntent);
		method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void downloadSubscription(android.telephony.euicc.DownloadableSubscription, boolean, android.app.PendingIntent);
		method @Nullable public String getEid();

api/system-current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -6433,8 +6433,8 @@ package android.service.carrier {

		public abstract class ApnService extends android.app.Service {
		ctor public ApnService();
		method public android.os.IBinder onBind(android.content.Intent);
		method @WorkerThread public abstract java.util.List<android.content.ContentValues> onRestoreApns(int);
		method @NonNull public android.os.IBinder onBind(@Nullable android.content.Intent);
		method @WorkerThread @NonNull public abstract java.util.List<android.content.ContentValues> onRestoreApns(int);
		}

		}
		@@ -7106,12 +7106,12 @@ package android.telephony {
		field public static final int WWAN = 1; // 0x1
		}

		public class CallAttributes implements android.os.Parcelable {
		ctor public CallAttributes(android.telephony.PreciseCallState, int, android.telephony.CallQuality);
		public final class CallAttributes implements android.os.Parcelable {
		ctor public CallAttributes(@NonNull android.telephony.PreciseCallState, int, @NonNull android.telephony.CallQuality);
		method public int describeContents();
		method public android.telephony.CallQuality getCallQuality();
		method @NonNull public android.telephony.CallQuality getCallQuality();
		method public int getNetworkType();
		method public android.telephony.PreciseCallState getPreciseCallState();
		method @NonNull public android.telephony.PreciseCallState getPreciseCallState();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CallAttributes> CREATOR;
		}
		@@ -8435,7 +8435,7 @@ package android.telephony.ims {
		}

		public class ImsCallSessionListener {
		method public void callQualityChanged(android.telephony.CallQuality);
		method public void callQualityChanged(@NonNull android.telephony.CallQuality);
		method public void callSessionConferenceExtendFailed(android.telephony.ims.ImsReasonInfo);
		method public void callSessionConferenceExtendReceived(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile);
		method public void callSessionConferenceExtended(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile);

core/java/android/service/carrier/ApnService.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.service.carrier;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.WorkerThread;
		import android.app.Service;
		@@ -60,7 +62,8 @@ public abstract class ApnService extends Service {
		};

		@Override
		public IBinder onBind(Intent intent) {
		@NonNull
		public IBinder onBind(@Nullable Intent intent) {
		return mBinder;
		}

		@@ -73,5 +76,6 @@ public abstract class ApnService extends Service {
		* subId.
		*/
		@WorkerThread
		@NonNull
		public abstract List<ContentValues> onRestoreApns(int subId);
		}

telephony/java/android/telephony/CallAttributes.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.telephony;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -29,15 +30,15 @@ import java.util.Objects;
		* @hide
		*/
		@SystemApi
		public class CallAttributes implements Parcelable {
		public final class CallAttributes implements Parcelable {
		private PreciseCallState mPreciseCallState;
		@NetworkType
		private int mNetworkType; // TelephonyManager.NETWORK_TYPE_* ints
		private CallQuality mCallQuality;


		public CallAttributes(PreciseCallState state, @NetworkType int networkType,
		CallQuality callQuality) {
		public CallAttributes(@NonNull PreciseCallState state, @NetworkType int networkType,
		@NonNull CallQuality callQuality) {
		this.mPreciseCallState = state;
		this.mNetworkType = networkType;
		this.mCallQuality = callQuality;
		@@ -59,6 +60,7 @@ public class CallAttributes implements Parcelable {
		/**
		* Returns the {@link PreciseCallState} of the call.
		*/
		@NonNull
		public PreciseCallState getPreciseCallState() {
		return mPreciseCallState;
		}
		@@ -96,6 +98,7 @@ public class CallAttributes implements Parcelable {
		/**
		* Returns the {#link CallQuality} of the call.
		*/
		@NonNull
		public CallQuality getCallQuality() {
		return mCallQuality;
		}

telephony/java/android/telephony/euicc/EuiccManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android.telephony.euicc;

		import android.Manifest;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		@@ -429,6 +430,7 @@ public class EuiccManager {
		*
		* @return an EuiccManager that uses the given card ID for all calls.
		*/
		@NonNull
		public EuiccManager createForCardId(int cardId) {
		return new EuiccManager(mContext, cardId);
		}