Merge "Merge commit 'e593d0a' into merge_work" (d4ea01b4) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −3

Original line number	Diff line number	Diff line
		@@ -17941,16 +17941,19 @@ package android.net {

		public class ConnectivityManager {
		method public void addDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
		method public boolean bindProcessToNetwork(android.net.Network);
		method public android.net.NetworkInfo getActiveNetworkInfo();
		method public android.net.NetworkInfo[] getAllNetworkInfo();
		method public android.net.Network[] getAllNetworks();
		method public deprecated boolean getBackgroundDataSetting();
		method public android.net.Network getBoundNetworkForProcess();
		method public android.net.ProxyInfo getDefaultProxy();
		method public android.net.LinkProperties getLinkProperties(android.net.Network);
		method public android.net.NetworkCapabilities getNetworkCapabilities(android.net.Network);
		method public android.net.NetworkInfo getNetworkInfo(int);
		method public android.net.NetworkInfo getNetworkInfo(android.net.Network);
		method public deprecated int getNetworkPreference();
		method public static android.net.Network getProcessDefaultNetwork();
		method public static deprecated android.net.Network getProcessDefaultNetwork();
		method public boolean isActiveNetworkMetered();
		method public boolean isDefaultNetworkActive();
		method public static boolean isNetworkTypeValid(int);
		@@ -17962,7 +17965,7 @@ package android.net {
		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 static 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);
		@@ -18131,6 +18134,7 @@ package android.net {
		method public java.net.InetAddress getByName(java.lang.String) throws java.net.UnknownHostException;
		method public javax.net.SocketFactory getSocketFactory();
		method public java.net.URLConnection openConnection(java.net.URL) throws java.io.IOException;
		method public java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) throws java.io.IOException;
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.Network> CREATOR;
		}
		@@ -18240,7 +18244,7 @@ package android.net {
		method public static final deprecated int getDefaultPort();
		method public static final deprecated java.lang.String getHost(android.content.Context);
		method public static final deprecated int getPort(android.content.Context);
		field public static final java.lang.String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";
		field public static final deprecated java.lang.String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";
		field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE";
		}

api/system-current.txt

+29 −16

Original line number	Diff line number	Diff line
		@@ -19392,16 +19392,19 @@ package android.net {

		public class ConnectivityManager {
		method public void addDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
		method public boolean bindProcessToNetwork(android.net.Network);
		method public android.net.NetworkInfo getActiveNetworkInfo();
		method public android.net.NetworkInfo[] getAllNetworkInfo();
		method public android.net.Network[] getAllNetworks();
		method public deprecated boolean getBackgroundDataSetting();
		method public android.net.Network getBoundNetworkForProcess();
		method public android.net.ProxyInfo getDefaultProxy();
		method public android.net.LinkProperties getLinkProperties(android.net.Network);
		method public android.net.NetworkCapabilities getNetworkCapabilities(android.net.Network);
		method public android.net.NetworkInfo getNetworkInfo(int);
		method public android.net.NetworkInfo getNetworkInfo(android.net.Network);
		method public deprecated int getNetworkPreference();
		method public static android.net.Network getProcessDefaultNetwork();
		method public static deprecated android.net.Network getProcessDefaultNetwork();
		method public boolean isActiveNetworkMetered();
		method public boolean isDefaultNetworkActive();
		method public static boolean isNetworkTypeValid(int);
		@@ -19413,7 +19416,7 @@ package android.net {
		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 static 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);
		@@ -19582,6 +19585,7 @@ package android.net {
		method public java.net.InetAddress getByName(java.lang.String) throws java.net.UnknownHostException;
		method public javax.net.SocketFactory getSocketFactory();
		method public java.net.URLConnection openConnection(java.net.URL) throws java.io.IOException;
		method public java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) throws java.io.IOException;
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.Network> CREATOR;
		}
		@@ -19716,7 +19720,7 @@ package android.net {
		method public static final deprecated int getDefaultPort();
		method public static final deprecated java.lang.String getHost(android.content.Context);
		method public static final deprecated int getPort(android.content.Context);
		field public static final java.lang.String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";
		field public static final deprecated java.lang.String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";
		field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE";
		}

		@@ -20419,21 +20423,25 @@ package android.net.wifi {
		field public static final int RTT_BW_40_SUPPORT = 8; // 0x8
		field public static final int RTT_BW_5_SUPPORT = 1; // 0x1
		field public static final int RTT_BW_80_SUPPORT = 16; // 0x10
		field public static final int RTT_CHANNEL_WIDTH_10 = 6; // 0x6
		field public static final int RTT_CHANNEL_WIDTH_160 = 3; // 0x3
		field public static final int RTT_CHANNEL_WIDTH_20 = 0; // 0x0
		field public static final int RTT_CHANNEL_WIDTH_40 = 1; // 0x1
		field public static final int RTT_CHANNEL_WIDTH_5 = 5; // 0x5
		field public static final int RTT_CHANNEL_WIDTH_80 = 2; // 0x2
		field public static final int RTT_CHANNEL_WIDTH_80P80 = 4; // 0x4
		field public static final deprecated int RTT_CHANNEL_WIDTH_10 = 6; // 0x6
		field public static final deprecated int RTT_CHANNEL_WIDTH_160 = 3; // 0x3
		field public static final deprecated int RTT_CHANNEL_WIDTH_20 = 0; // 0x0
		field public static final deprecated int RTT_CHANNEL_WIDTH_40 = 1; // 0x1
		field public static final deprecated int RTT_CHANNEL_WIDTH_5 = 5; // 0x5
		field public static final deprecated int RTT_CHANNEL_WIDTH_80 = 2; // 0x2
		field public static final deprecated int RTT_CHANNEL_WIDTH_80P80 = 4; // 0x4
		field public static final deprecated int RTT_CHANNEL_WIDTH_UNSPECIFIED = -1; // 0xffffffff
		field public static final int RTT_PEER_NAN = 5; // 0x5
		field public static final int RTT_PEER_P2P_CLIENT = 4; // 0x4
		field public static final int RTT_PEER_P2P_GO = 3; // 0x3
		field public static final int RTT_PEER_TYPE_AP = 1; // 0x1
		field public static final int RTT_PEER_TYPE_STA = 2; // 0x2
		field public static final int RTT_PEER_TYPE_UNSPECIFIED = 0; // 0x0
		field public static final deprecated int RTT_PEER_TYPE_UNSPECIFIED = 0; // 0x0
		field public static final int RTT_STATUS_ABORTED = 8; // 0x8
		field public static final int RTT_STATUS_FAILURE = 1; // 0x1
		field public static final int RTT_STATUS_FAIL_AP_ON_DIFF_CHANNEL = 6; // 0x6
		field public static final int RTT_STATUS_FAIL_BUSY_TRY_LATER = 12; // 0xc
		field public static final int RTT_STATUS_FAIL_FTM_PARAM_OVERRIDE = 15; // 0xf
		field public static final int RTT_STATUS_FAIL_INVALID_TS = 9; // 0x9
		field public static final int RTT_STATUS_FAIL_NOT_SCHEDULED_YET = 4; // 0x4
		field public static final int RTT_STATUS_FAIL_NO_CAPABILITY = 7; // 0x7
		@@ -20442,11 +20450,13 @@ package android.net.wifi {
		field public static final int RTT_STATUS_FAIL_REJECTED = 3; // 0x3
		field public static final int RTT_STATUS_FAIL_SCHEDULE = 11; // 0xb
		field public static final int RTT_STATUS_FAIL_TM_TIMEOUT = 5; // 0x5
		field public static final int RTT_STATUS_INVALID_REQ = 13; // 0xd
		field public static final int RTT_STATUS_NO_WIFI = 14; // 0xe
		field public static final int RTT_STATUS_SUCCESS = 0; // 0x0
		field public static final deprecated int RTT_TYPE_11_MC = 4; // 0x4
		field public static final deprecated int RTT_TYPE_11_V = 2; // 0x2
		field public static final int RTT_TYPE_ONE_SIDED = 1; // 0x1
		field public static final int RTT_TYPE_TWO_SIDED = 4; // 0x4
		field public static final int RTT_TYPE_TWO_SIDED = 2; // 0x2
		field public static final deprecated int RTT_TYPE_UNSPECIFIED = 0; // 0x0
		}

		@@ -20514,6 +20524,8 @@ package android.net.wifi {

		public static class RttManager.RttResult {
		ctor public RttManager.RttResult();
		field public android.net.wifi.RttManager.WifiInformationElement LCI;
		field public android.net.wifi.RttManager.WifiInformationElement LCR;
		field public java.lang.String bssid;
		field public int burstDuration;
		field public int burstNumber;
		@@ -20526,6 +20538,7 @@ package android.net.wifi {
		field public int frameNumberPerBurstPeer;
		field public int measurementFrameNumber;
		field public int measurementType;
		field public int negotiatedBurstNum;
		field public deprecated int requestType;
		field public int retryAfterDuration;
		field public int rssi;
		@@ -20545,10 +20558,10 @@ package android.net.wifi {
		field public deprecated int tx_rate;
		}

		public class RttManager.wifiInformationElement {
		ctor public RttManager.wifiInformationElement();
		field public java.lang.String data;
		field public int id;
		public static class RttManager.WifiInformationElement {
		ctor public RttManager.WifiInformationElement();
		field public byte[] data;
		field public byte id;
		}

		public class ScanResult implements android.os.Parcelable {

core/java/android/app/ActivityThread.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -865,10 +865,10 @@ public final class ActivityThread {
		}

		public void setHttpProxy(String host, String port, String exclList, Uri pacFileUrl) {
		final Network network = ConnectivityManager.getProcessDefaultNetwork();
		final ConnectivityManager cm = ConnectivityManager.from(getSystemContext());
		final Network network = cm.getBoundNetworkForProcess();
		if (network != null) {
		Proxy.setHttpProxySystemProperty(
		ConnectivityManager.from(getSystemContext()).getDefaultProxy());
		Proxy.setHttpProxySystemProperty(cm.getDefaultProxy());
		} else {
		Proxy.setHttpProxySystemProperty(host, port, exclList, pacFileUrl);
		}

core/java/android/bluetooth/BluetoothAdapter.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -994,6 +994,24 @@ public final class BluetoothAdapter {
		return false;
		}

		/**
		* Return true if hardware has entries available for matching beacons
		*
		* @return true if there are hw entries available for matching beacons
		* @hide
		*/
		public boolean isHardwareTrackingFiltersAvailable() {
		if (getState() != STATE_ON) return false;
		try {
		synchronized(mManagerCallback) {
		if(mService != null) return (mService.numOfHwTrackFiltersAvailable() != 0);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		}
		return false;
		}

		/**
		* Return the record of {@link BluetoothActivityEnergyInfo} object that
		* has the activity and energy info. This can be used to ascertain what

core/java/android/bluetooth/IBluetooth.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ interface IBluetooth
		boolean isActivityAndEnergyReportingSupported();
		void getActivityEnergyInfoFromController();
		BluetoothActivityEnergyInfo reportActivityInfo();
		int numOfHwTrackFiltersAvailable();

		// for dumpsys support
		String dump();