Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bd80142 authored Jan 11, 2017 by Lorenzo Colitti Committed by Android (Google) Code Review Jan 11, 2017

Merge "Remove requestRouteToHost and {start,stop}UsingNetworkFeature."

parents e89ba522 2187df75

api/current.txt

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -24000,11 +24000,8 @@ package android.net {
	method public boolean requestBandwidthUpdate(android.net.Network);		method public boolean requestBandwidthUpdate(android.net.Network);
	method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);		method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
	method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);		method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);
	method public deprecated boolean requestRouteToHost(int, int);
	method public deprecated void setNetworkPreference(int);		method public deprecated void setNetworkPreference(int);
	method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);		method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);
	method public deprecated int startUsingNetworkFeature(int, java.lang.String);
	method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
	method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);		method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
	method public void unregisterNetworkCallback(android.app.PendingIntent);		method public void unregisterNetworkCallback(android.app.PendingIntent);
	field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";		field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";

api/removed.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -126,6 +126,12 @@ package android.media.tv {

	package android.net {		package android.net {

			public class ConnectivityManager {
			method public deprecated boolean requestRouteToHost(int, int);
			method public deprecated int startUsingNetworkFeature(int, java.lang.String);
			method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
			}

	public abstract class PskKeyManager {		public abstract class PskKeyManager {
	ctor public PskKeyManager();		ctor public PskKeyManager();
	field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80		field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80

api/system-current.txt

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -25792,14 +25792,11 @@ package android.net {
	method public boolean requestBandwidthUpdate(android.net.Network);		method public boolean requestBandwidthUpdate(android.net.Network);
	method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);		method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
	method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);		method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);
	method public deprecated boolean requestRouteToHost(int, int);
	method public deprecated void setNetworkPreference(int);		method public deprecated void setNetworkPreference(int);
	method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);		method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);
	method public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);		method public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);
	method public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler);		method public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler);
	method public deprecated int startUsingNetworkFeature(int, java.lang.String);
	method public void stopTethering(int);		method public void stopTethering(int);
	method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
	method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);		method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
	method public void unregisterNetworkCallback(android.app.PendingIntent);		method public void unregisterNetworkCallback(android.app.PendingIntent);
	field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";		field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";

api/system-removed.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -124,6 +124,12 @@ package android.media.tv {

	package android.net {		package android.net {

			public class ConnectivityManager {
			method public deprecated boolean requestRouteToHost(int, int);
			method public deprecated int startUsingNetworkFeature(int, java.lang.String);
			method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
			}

	public abstract class PskKeyManager {		public abstract class PskKeyManager {
	ctor public PskKeyManager();		ctor public PskKeyManager();
	field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80		field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80

api/test-current.txt

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -24087,11 +24087,8 @@ package android.net {
	method public boolean requestBandwidthUpdate(android.net.Network);		method public boolean requestBandwidthUpdate(android.net.Network);
	method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);		method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
	method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);		method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);
	method public deprecated boolean requestRouteToHost(int, int);
	method public deprecated void setNetworkPreference(int);		method public deprecated void setNetworkPreference(int);
	method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);		method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);
	method public deprecated int startUsingNetworkFeature(int, java.lang.String);
	method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
	method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);		method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
	method public void unregisterNetworkCallback(android.app.PendingIntent);		method public void unregisterNetworkCallback(android.app.PendingIntent);
	field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";		field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";