Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'e593d0a' into merge_work

Browse Source 
Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
This commit is contained in:
Prerepa Viswanadham
2015-04-10 15:58:10 -07:00
parent 3932bb4153 e593d0aec6
commit 57bf2a8a38
45 changed files with 1284 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/current.txt
View File

@@ -17836,16 +17836,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);
@@ -17857,7 +17860,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);
@@ -18026,6 +18029,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;
}
@@ -18135,7 +18139,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";
}

45
api/system-current.txt
View File

@@ -19287,16 +19287,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);
@@ -19308,7 +19311,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);
@@ -19477,6 +19480,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;
}
@@ -19611,7 +19615,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";
}
@@ -20314,21 +20318,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
@@ -20337,11 +20345,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
}
@@ -20409,6 +20419,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;
@@ -20421,6 +20433,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;
@@ -20440,10 +20453,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 {