Merge "Fix API in CaptivePortal and ConnectivityManager" (3c959339) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -3086,7 +3086,6 @@ package android.metrics {
		package android.net {

		public class CaptivePortal implements android.os.Parcelable {
		ctor public CaptivePortal(@NonNull android.os.IBinder);
		method public void logEvent(int, @NonNull String);
		method public void useNetwork();
		field public static final int APP_RETURN_DISMISSED = 0; // 0x0
		@@ -3097,12 +3096,12 @@ package android.net {
		public class ConnectivityManager {
		method @RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD) public android.net.SocketKeepalive createNattKeepalive(@NonNull android.net.Network, @NonNull java.io.FileDescriptor, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);
		method @RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD) public android.net.SocketKeepalive createSocketKeepalive(@NonNull android.net.Network, @NonNull java.net.Socket, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);
		method public boolean getAvoidBadWifi();
		method @RequiresPermission(android.Manifest.permission.LOCAL_MAC_ADDRESS) public String getCaptivePortalServerUrl();
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void getLatestTetheringEntitlementResult(int, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEntitlementResultListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void registerTetheringEventCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEventCallback);
		method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void setAirplaneMode(boolean);
		method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, "android.permission.NETWORK_STACK"}) public boolean shouldAvoidBadWifi();
		method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(@NonNull android.net.Network, @NonNull android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler);

api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -602,7 +602,6 @@ package android.media.audiofx {
		package android.net {

		public class CaptivePortal implements android.os.Parcelable {
		ctor public CaptivePortal(@NonNull android.os.IBinder);
		method public void logEvent(int, @NonNull String);
		method public void useNetwork();
		field public static final int APP_RETURN_DISMISSED = 0; // 0x0

core/java/android/net/CaptivePortal.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -64,8 +64,6 @@ public class CaptivePortal implements Parcelable {
		private final IBinder mBinder;

		/** @hide */
		@SystemApi
		@TestApi
		public CaptivePortal(@NonNull IBinder binder) {
		mBinder = binder;
		}

core/java/android/net/ConnectivityManager.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -4101,9 +4101,12 @@ public class ConnectivityManager {
		* @hide
		*/
		@SystemApi
		public boolean getAvoidBadWifi() {
		@RequiresPermission(anyOf = {
		NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
		android.Manifest.permission.NETWORK_STACK})
		public boolean shouldAvoidBadWifi() {
		try {
		return mService.getAvoidBadWifi();
		return mService.shouldAvoidBadWifi();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/net/IConnectivityManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ interface IConnectivityManager
		void startCaptivePortalApp(in Network network);
		void startCaptivePortalAppInternal(in Network network, in Bundle appExtras);

		boolean getAvoidBadWifi();
		boolean shouldAvoidBadWifi();
		int getMultipathPreference(in Network Network);

		NetworkRequest getDefaultRequest();