Merge "Add Nullable/NonNull Annotations where appropriate." (eb4d2067) · Commits · e / os / android_frameworks_base

api/system-current.txt

+15 −15

Original line number	Diff line number	Diff line
		@@ -6916,7 +6916,7 @@ package android.telephony.ims {
		public class ImsException extends java.lang.Exception {
		ctor public ImsException(@Nullable String);
		ctor public ImsException(@Nullable String, int);
		ctor public ImsException(@Nullable String, int, Throwable);
		ctor public ImsException(@Nullable String, int, @Nullable Throwable);
		method public int getCode();
		field public static final int CODE_ERROR_SERVICE_UNAVAILABLE = 1; // 0x1
		field public static final int CODE_ERROR_UNSPECIFIED = 0; // 0x0
		@@ -6924,13 +6924,13 @@ package android.telephony.ims {
		}

		public final class ImsExternalCallState implements android.os.Parcelable {
		ctor public ImsExternalCallState(String, android.net.Uri, android.net.Uri, boolean, int, int, boolean);
		ctor public ImsExternalCallState(@NonNull String, @NonNull android.net.Uri, @Nullable android.net.Uri, boolean, int, int, boolean);
		method public int describeContents();
		method public android.net.Uri getAddress();
		method @NonNull public android.net.Uri getAddress();
		method public int getCallId();
		method public int getCallState();
		method public int getCallType();
		method public android.net.Uri getLocalAddress();
		method @Nullable public android.net.Uri getLocalAddress();
		method public boolean isCallHeld();
		method public boolean isCallPullable();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -6940,7 +6940,7 @@ package android.telephony.ims {
		}

		public class ImsMmTelManager {
		method public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);
		method @NonNull public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoWiFiModeSetting();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoWiFiRoamingModeSetting();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAdvancedCallingSettingEnabled();
		@@ -6949,7 +6949,7 @@ package android.telephony.ims {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isVoWiFiRoamingSettingEnabled();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isVoWiFiSettingEnabled();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isVtSettingEnabled();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerMmTelCapabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.CapabilityCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAdvancedCallingSettingEnabled(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRttCapabilitySetting(boolean);
		@@ -6968,15 +6968,15 @@ package android.telephony.ims {

		public static class ImsMmTelManager.CapabilityCallback {
		ctor public ImsMmTelManager.CapabilityCallback();
		method public void onCapabilitiesStatusChanged(android.telephony.ims.feature.MmTelFeature.MmTelCapabilities);
		method public void onCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.MmTelFeature.MmTelCapabilities);
		}

		public static class ImsMmTelManager.RegistrationCallback {
		ctor public ImsMmTelManager.RegistrationCallback();
		method public void onRegistered(int);
		method public void onRegistering(int);
		method public void onTechnologyChangeFailed(int, android.telephony.ims.ImsReasonInfo);
		method public void onUnregistered(android.telephony.ims.ImsReasonInfo);
		method public void onTechnologyChangeFailed(int, @Nullable android.telephony.ims.ImsReasonInfo);
		method public void onUnregistered(@Nullable android.telephony.ims.ImsReasonInfo);
		}

		public final class ImsReasonInfo implements android.os.Parcelable {
		@@ -7385,14 +7385,14 @@ package android.telephony.ims {
		}

		public class ProvisioningManager {
		method public static android.telephony.ims.ProvisioningManager createForSubscriptionId(int);
		method @NonNull public static android.telephony.ims.ProvisioningManager createForSubscriptionId(int);
		method @WorkerThread @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getProvisioningIntValue(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int);
		method @WorkerThread @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getProvisioningStringValue(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerProvisioningChangedCallback(java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.Callback) throws android.telephony.ims.ImsException;
		method @WorkerThread @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public String getProvisioningStringValue(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.Callback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningIntValue(int, int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, String);
		method @WorkerThread @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);
		field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b
		field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a

telephony/java/android/telephony/ims/ImsException.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,8 @@ public class ImsException extends Exception {
		* @param message an optional message to detail the error condition more specifically.
		* @param cause the {@link Throwable} that caused this {@link ImsException} to be created.
		*/
		public ImsException(@Nullable String message, @ImsErrorCode int code, Throwable cause) {
		public ImsException(@Nullable String message, @ImsErrorCode int code,
		@Nullable Throwable cause) {
		super(getMessage(message, code), cause);
		mCode = code;
		}

telephony/java/android/telephony/ims/ImsExternalCallState.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.telephony.ims;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.net.Uri;
		import android.os.Parcel;
		@@ -124,9 +126,9 @@ public final class ImsExternalCallState implements Parcelable {
		* @param callType The type of external call.
		* @param isCallheld A flag determining if the external connection is currently held.
		*/
		public ImsExternalCallState(String callId, Uri address, Uri localAddress,
		boolean isPullable, @ExternalCallState int callState, @ExternalCallType int callType,
		boolean isCallheld) {
		public ImsExternalCallState(@NonNull String callId, @NonNull Uri address,
		@Nullable Uri localAddress, boolean isPullable, @ExternalCallState int callState,
		@ExternalCallType int callType, boolean isCallheld) {
		mCallId = getIdForString(callId);
		mAddress = address;
		mLocalAddress = localAddress;
		@@ -184,14 +186,14 @@ public final class ImsExternalCallState implements Parcelable {
		return mCallId;
		}

		public Uri getAddress() {
		public @NonNull Uri getAddress() {
		return mAddress;
		}

		/**
		* @return A {@link Uri} containing the local address from the Multiendpoint Dialog Information.
		*/
		public Uri getLocalAddress() {
		public @Nullable Uri getLocalAddress() {
		return mLocalAddress;
		}

telephony/java/android/telephony/ims/ImsMmTelManager.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.Manifest;
		import android.annotation.CallbackExecutor;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.content.Context;
		@@ -199,7 +200,7 @@ public class ImsMmTelManager {
		*
		* @param info the {@link ImsReasonInfo} associated with why registration was disconnected.
		*/
		public void onUnregistered(ImsReasonInfo info) {
		public void onUnregistered(@Nullable ImsReasonInfo info) {
		}

		/**
		@@ -211,7 +212,7 @@ public class ImsMmTelManager {
		* transport type that has failed to handover registration to.
		* @param info A {@link ImsReasonInfo} that identifies the reason for failure.
		*/
		public void onTechnologyChangeFailed(int imsTransportType, ImsReasonInfo info) {
		public void onTechnologyChangeFailed(int imsTransportType, @Nullable ImsReasonInfo info) {
		}

		/**
		@@ -223,7 +224,7 @@ public class ImsMmTelManager {
		* subscription.
		* @hide
		*/
		public void onSubscriberAssociatedUriChanged(Uri[] uris) {
		public void onSubscriberAssociatedUriChanged(@Nullable Uri[] uris) {
		}

		/*@hide/
		@@ -294,7 +295,7 @@ public class ImsMmTelManager {
		* @param capabilities The new availability of the capabilities.
		*/
		public void onCapabilitiesStatusChanged(
		MmTelFeature.MmTelCapabilities capabilities) {
		@NonNull MmTelFeature.MmTelCapabilities capabilities) {
		}

		/*@hide/
		@@ -319,7 +320,7 @@ public class ImsMmTelManager {
		* @see android.telephony.SubscriptionManager#getActiveSubscriptionInfoList()
		* @throws IllegalArgumentException if the subscription is invalid.
		*/
		public static ImsMmTelManager createForSubscriptionId(int subId) {
		public static @NonNull ImsMmTelManager createForSubscriptionId(int subId) {
		if (!SubscriptionManager.isValidSubscriptionId(subId)) {
		throw new IllegalArgumentException("Invalid subscription ID");
		}
		@@ -357,7 +358,7 @@ public class ImsMmTelManager {
		* reason.
		*/
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public void registerImsRegistrationCallback(@CallbackExecutor Executor executor,
		public void registerImsRegistrationCallback(@NonNull @CallbackExecutor Executor executor,
		@NonNull RegistrationCallback c) throws ImsException {
		if (c == null) {
		throw new IllegalArgumentException("Must include a non-null RegistrationCallback.");

telephony/java/android/telephony/ims/ProvisioningManager.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.telephony.ims;
		import android.Manifest;
		import android.annotation.CallbackExecutor;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.WorkerThread;
		@@ -177,7 +178,7 @@ public class ProvisioningManager {
		* @see android.telephony.SubscriptionManager#getActiveSubscriptionInfoList()
		* @throws IllegalArgumentException if the subscription is invalid.
		*/
		public static ProvisioningManager createForSubscriptionId(int subId) {
		public static @NonNull ProvisioningManager createForSubscriptionId(int subId) {
		if (!SubscriptionManager.isValidSubscriptionId(subId)) {
		throw new IllegalArgumentException("Invalid subscription ID");
		}
		@@ -206,7 +207,7 @@ public class ProvisioningManager {
		* reason.
		*/
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public void registerProvisioningChangedCallback(@CallbackExecutor Executor executor,
		public void registerProvisioningChangedCallback(@NonNull @CallbackExecutor Executor executor,
		@NonNull Callback callback) throws ImsException {
		callback.setExecutor(executor);
		try {
		@@ -271,7 +272,7 @@ public class ProvisioningManager {
		*/
		@WorkerThread
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public String getProvisioningStringValue(int key) {
		public @Nullable String getProvisioningStringValue(int key) {
		try {
		return getITelephony().getImsProvisioningString(mSubId, key);
		} catch (RemoteException e) {
		@@ -313,7 +314,7 @@ public class ProvisioningManager {
		@WorkerThread
		@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
		public @ImsConfigImplBase.SetConfigResult int setProvisioningStringValue(int key,
		String value) {
		@NonNull String value) {
		try {
		return getITelephony().setImsProvisioningString(mSubId, key, value);
		} catch (RemoteException e) {
		@@ -333,6 +334,7 @@ public class ProvisioningManager {
		* @see CarrierConfigManager#KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
		* @param isProvisioned true if the device is provisioned for UT over IMS, false otherwise.
		*/
		@WorkerThread
		@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
		public void setProvisioningStatusForCapability(
		@MmTelFeature.MmTelCapabilities.MmTelCapability int capability,
		@@ -359,6 +361,7 @@ public class ProvisioningManager {
		* provisioning, false if the capability does require provisioning and has not been
		* provisioned yet.
		*/
		@WorkerThread
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public boolean getProvisioningStatusForCapability(
		@MmTelFeature.MmTelCapabilities.MmTelCapability int capability,