Merge "Fixed all APIs not meeting API review requirement" (a3f1b3f1) · Commits · e / os / android_frameworks_base

api/system-current.txt

+14 −14

Original line number	Diff line number	Diff line
		@@ -3133,8 +3133,8 @@ package android.net {

		public class LinkAddress implements android.os.Parcelable {
		ctor public LinkAddress(java.net.InetAddress, int, int, int);
		ctor public LinkAddress(java.net.InetAddress, int);
		ctor public LinkAddress(String);
		ctor public LinkAddress(@NonNull java.net.InetAddress, int);
		ctor public LinkAddress(@NonNull String);
		ctor public LinkAddress(String, int, int);
		method public boolean isGlobalPreferred();
		method public boolean isIPv4();
		@@ -6070,7 +6070,7 @@ package android.telephony {
		public abstract class NetworkService.NetworkServiceProvider implements java.lang.AutoCloseable {
		ctor public NetworkService.NetworkServiceProvider(int);
		method public abstract void close();
		method public void getNetworkRegistrationState(int, android.telephony.NetworkServiceCallback);
		method public void getNetworkRegistrationState(int, @NonNull android.telephony.NetworkServiceCallback);
		method public final int getSlotId();
		method public final void notifyNetworkRegistrationStateChanged();
		}
		@@ -6251,12 +6251,12 @@ package android.telephony {
		}

		public class ServiceState implements android.os.Parcelable {
		method public android.telephony.NetworkRegistrationState getNetworkRegistrationState(int, int);
		method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates();
		method @Deprecated public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(int);
		method @Deprecated public android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, int);
		method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForDomain(int);
		method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(int);
		method @Nullable public android.telephony.NetworkRegistrationState getNetworkRegistrationState(int, int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates();
		method @Deprecated @NonNull public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(int);
		method @Deprecated @Nullable public android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForDomain(int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(int);
		field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2
		field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3
		field public static final int ROAMING_TYPE_NOT_ROAMING = 0; // 0x0
		@@ -6563,9 +6563,9 @@ package android.telephony.data {
		method public void getDataCallList(@NonNull android.telephony.data.DataServiceCallback);
		method public final int getSlotId();
		method public final void notifyDataCallListChanged(java.util.List<android.telephony.data.DataCallResponse>);
		method public void setDataProfile(java.util.List<android.telephony.data.DataProfile>, boolean, @Nullable android.telephony.data.DataServiceCallback);
		method public void setInitialAttachApn(android.telephony.data.DataProfile, boolean, @Nullable android.telephony.data.DataServiceCallback);
		method public void setupDataCall(int, android.telephony.data.DataProfile, boolean, boolean, int, @Nullable android.net.LinkProperties, @Nullable android.telephony.data.DataServiceCallback);
		method public void setDataProfile(@NonNull java.util.List<android.telephony.data.DataProfile>, boolean, @Nullable android.telephony.data.DataServiceCallback);
		method public void setInitialAttachApn(@NonNull android.telephony.data.DataProfile, boolean, @Nullable android.telephony.data.DataServiceCallback);
		method public void setupDataCall(int, @NonNull android.telephony.data.DataProfile, boolean, boolean, int, @Nullable android.net.LinkProperties, @Nullable android.telephony.data.DataServiceCallback);
		}

		public class DataServiceCallback {
		@@ -6584,7 +6584,7 @@ package android.telephony.data {

		public abstract class QualifiedNetworksService extends android.app.Service {
		ctor public QualifiedNetworksService();
		method public abstract android.telephony.data.QualifiedNetworksService.NetworkAvailabilityUpdater createNetworkAvailabilityUpdater(int);
		method @NonNull public abstract android.telephony.data.QualifiedNetworksService.NetworkAvailabilityUpdater createNetworkAvailabilityUpdater(int);
		field public static final String QUALIFIED_NETWORKS_SERVICE_INTERFACE = "android.telephony.data.QualifiedNetworksService";
		}

		@@ -6592,7 +6592,7 @@ package android.telephony.data {
		ctor public QualifiedNetworksService.NetworkAvailabilityUpdater(int);
		method public abstract void close();
		method public final int getSlotIndex();
		method public final void updateQualifiedNetworkTypes(int, int[]);
		method public final void updateQualifiedNetworkTypes(int, @Nullable int[]);
		}

		}

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -626,8 +626,8 @@ package android.net {

		public class LinkAddress implements android.os.Parcelable {
		ctor public LinkAddress(java.net.InetAddress, int, int, int);
		ctor public LinkAddress(java.net.InetAddress, int);
		ctor public LinkAddress(String);
		ctor public LinkAddress(@NonNull java.net.InetAddress, int);
		ctor public LinkAddress(@NonNull String);
		ctor public LinkAddress(String, int, int);
		method public boolean isGlobalPreferred();
		method public boolean isIPv4();

core/java/android/net/LinkAddress.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static android.system.OsConstants.RT_SCOPE_LINK;
		import static android.system.OsConstants.RT_SCOPE_SITE;
		import static android.system.OsConstants.RT_SCOPE_UNIVERSE;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		@@ -177,7 +178,7 @@ public class LinkAddress implements Parcelable {
		*/
		@SystemApi
		@TestApi
		public LinkAddress(InetAddress address, int prefixLength) {
		public LinkAddress(@NonNull InetAddress address, int prefixLength) {
		this(address, prefixLength, 0, 0);
		this.scope = scopeForUnicastAddress(address);
		}
		@@ -196,12 +197,12 @@ public class LinkAddress implements Parcelable {
		/**
		* Constructs a new {@code LinkAddress} from a string such as "192.0.2.5/24" or
		* "2001:db8::1/64". The flags are set to zero and the scope is determined from the address.
		* @param string The string to parse.
		* @param address The string to parse.
		* @hide
		*/
		@SystemApi
		@TestApi
		public LinkAddress(String address) {
		public LinkAddress(@NonNull String address) {
		this(address, 0, 0);
		this.scope = scopeForUnicastAddress(this.address);
		}
		@@ -209,7 +210,7 @@ public class LinkAddress implements Parcelable {
		/**
		* Constructs a new {@code LinkAddress} from a string such as "192.0.2.5/24" or
		* "2001:db8::1/64", with the specified flags and scope.
		* @param string The string to parse.
		* @param address The string to parse.
		* @param flags The address flags.
		* @param scope The address scope.
		* @hide

telephony/java/android/telephony/NetworkService.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.os.IBinder;
		import android.os.Looper;
		import android.os.Message;
		import android.os.RemoteException;
		import android.telephony.NetworkRegistrationState.Domain;
		import android.util.SparseArray;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -99,11 +100,12 @@ public abstract class NetworkService extends Service {

		/**
		* API to get network registration state. The result will be passed to the callback.
		* @param domain
		* @param callback
		* @param domain Network domain
		* @param callback The callback for reporting network registration state
		* @return SIM slot id the network service associated with.
		*/
		public void getNetworkRegistrationState(int domain, NetworkServiceCallback callback) {
		public void getNetworkRegistrationState(@Domain int domain,
		@NonNull NetworkServiceCallback callback) {
		callback.onGetNetworkRegistrationStateComplete(
		NetworkServiceCallback.RESULT_ERROR_UNSUPPORTED, null);
		}

telephony/java/android/telephony/ServiceState.java

+8 −0

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

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		@@ -1760,6 +1762,7 @@ public class ServiceState implements Parcelable {
		* @return List of {@link NetworkRegistrationState}
		* @hide
		*/
		@NonNull
		@SystemApi
		public List<NetworkRegistrationState> getNetworkRegistrationStates() {
		synchronized (mNetworkRegistrationStates) {
		@@ -1776,6 +1779,7 @@ public class ServiceState implements Parcelable {
		*
		* @deprecated Use {@link #getNetworkRegistrationStatesFromTransportType(int)}
		*/
		@NonNull
		@Deprecated
		@SystemApi
		public List<NetworkRegistrationState> getNetworkRegistrationStates(int transportType) {
		@@ -1789,6 +1793,7 @@ public class ServiceState implements Parcelable {
		* @return List of {@link NetworkRegistrationState}
		* @hide
		*/
		@NonNull
		@SystemApi
		public List<NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(
		int transportType) {
		@@ -1812,6 +1817,7 @@ public class ServiceState implements Parcelable {
		* @return List of {@link NetworkRegistrationState}
		* @hide
		*/
		@NonNull
		@SystemApi
		public List<NetworkRegistrationState> getNetworkRegistrationStatesForDomain(
		@Domain int domain) {
		@@ -1838,6 +1844,7 @@ public class ServiceState implements Parcelable {
		*
		* @deprecated Use {@link #getNetworkRegistrationState(int, int)}
		*/
		@Nullable
		@Deprecated
		@SystemApi
		public NetworkRegistrationState getNetworkRegistrationStates(@Domain int domain,
		@@ -1854,6 +1861,7 @@ public class ServiceState implements Parcelable {
		* @hide
		*
		*/
		@Nullable
		@SystemApi
		public NetworkRegistrationState getNetworkRegistrationState(@Domain int domain,
		int transportType) {