Merge "API tweaks round 2" (3c0a49ec) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -41736,7 +41736,7 @@ package android.telecom {

		public final class PhoneAccountSuggestion implements android.os.Parcelable {
		method public int describeContents();
		method public android.telecom.PhoneAccountHandle getPhoneAccountHandle();
		method @NonNull public android.telecom.PhoneAccountHandle getPhoneAccountHandle();
		method public int getReason();
		method public boolean shouldAutoSelect();
		method public void writeToParcel(android.os.Parcel, int);

api/system-current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -5413,7 +5413,7 @@ package android.telecom {
		}

		public final class PhoneAccountSuggestion implements android.os.Parcelable {
		ctor public PhoneAccountSuggestion(android.telecom.PhoneAccountHandle, int, boolean);
		ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
		}

		public class PhoneAccountSuggestionService extends android.app.Service {
		@@ -6100,7 +6100,7 @@ package android.telephony {
		public final class PhoneNumberRange implements android.os.Parcelable {
		ctor public PhoneNumberRange(@NonNull String, @NonNull String, @NonNull String, @NonNull String);
		method public int describeContents();
		method public boolean matches(String);
		method public boolean matches(@NonNull String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.PhoneNumberRange> CREATOR;
		}
		@@ -6366,6 +6366,7 @@ package android.telephony {
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.util.Pair<java.lang.Integer,java.lang.Integer>> getLogicalToPhysicalSlotMapping();
		method public static long getMaxNumberVerificationTimeoutMillis();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmap();
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState();
		method public int getSimApplicationState();
		@@ -6426,7 +6427,6 @@ package android.telephony {
		field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";
		field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";
		field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";
		field public static final long MAX_NUMBER_VERIFICATION_TIMEOUT_MILLIS = 60000L; // 0xea60L
		field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
		field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
		field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L
		@@ -7710,12 +7710,12 @@ package android.telephony.mbms.vendor {
		public class MbmsGroupCallServiceBase extends android.app.Service {
		ctor public MbmsGroupCallServiceBase();
		method public void dispose(int) throws android.os.RemoteException;
		method public int initialize(android.telephony.mbms.MbmsGroupCallSessionCallback, int) throws android.os.RemoteException;
		method public int initialize(@NonNull android.telephony.mbms.MbmsGroupCallSessionCallback, int) throws android.os.RemoteException;
		method public void onAppCallbackDied(int, int);
		method public android.os.IBinder onBind(android.content.Intent);
		method public int startGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>, android.telephony.mbms.GroupCallCallback);
		method public int startGroupCall(int, long, @NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<java.lang.Integer>, @NonNull android.telephony.mbms.GroupCallCallback);
		method public void stopGroupCall(int, long);
		method public void updateGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>);
		method public void updateGroupCall(int, long, @NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<java.lang.Integer>);
		}

		public class MbmsStreamingServiceBase extends android.os.Binder {

api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -1440,7 +1440,7 @@ package android.telecom {
		}

		public final class PhoneAccountSuggestion implements android.os.Parcelable {
		ctor public PhoneAccountSuggestion(android.telecom.PhoneAccountHandle, int, boolean);
		ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
		}

		public class PhoneAccountSuggestionService extends android.app.Service {
		@@ -1544,12 +1544,12 @@ package android.telephony.mbms.vendor {
		public class MbmsGroupCallServiceBase extends android.app.Service {
		ctor public MbmsGroupCallServiceBase();
		method public void dispose(int) throws android.os.RemoteException;
		method public int initialize(android.telephony.mbms.MbmsGroupCallSessionCallback, int) throws android.os.RemoteException;
		method public int initialize(@NonNull android.telephony.mbms.MbmsGroupCallSessionCallback, int) throws android.os.RemoteException;
		method public void onAppCallbackDied(int, int);
		method public android.os.IBinder onBind(android.content.Intent);
		method public int startGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>, android.telephony.mbms.GroupCallCallback);
		method public int startGroupCall(int, long, @NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<java.lang.Integer>, @NonNull android.telephony.mbms.GroupCallCallback);
		method public void stopGroupCall(int, long);
		method public void updateGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>);
		method public void updateGroupCall(int, long, @NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<java.lang.Integer>);
		}

		public class MbmsStreamingServiceBase extends android.os.Binder {

telecomm/java/android/telecom/PhoneAccountSuggestion.java

+3 −2

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

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Parcel;
		@@ -72,7 +73,7 @@ public final class PhoneAccountSuggestion implements Parcelable {
		*/
		@SystemApi
		@TestApi
		public PhoneAccountSuggestion(PhoneAccountHandle handle, @SuggestionReason int reason,
		public PhoneAccountSuggestion(@NonNull PhoneAccountHandle handle, @SuggestionReason int reason,
		boolean shouldAutoSelect) {
		this.mHandle = handle;
		this.mReason = reason;
		@@ -101,7 +102,7 @@ public final class PhoneAccountSuggestion implements Parcelable {
		/**
		* @return The {@link PhoneAccountHandle} for this suggestion.
		*/
		public PhoneAccountHandle getPhoneAccountHandle() {
		@NonNull public PhoneAccountHandle getPhoneAccountHandle() {
		return mHandle;
		}

telephony/java/android/telephony/PhoneNumberRange.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ public final class PhoneNumberRange implements Parcelable {
		* @param number A phone number, with or without separators or a country code.
		* @return {@code true} if the number matches, {@code false} otherwise.
		*/
		public boolean matches(String number) {
		public boolean matches(@NonNull String number) {
		// Check the prefix, make sure it matches either with or without the country code.
		String normalizedNumber = number.replaceAll("[^0-9]", "");
		String prefixWithCountryCode = mCountryCode + mPrefix;