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

Merge changes from topic "unwanted" into pi-dev

Browse Source 
* changes:
  Add @param tag for state in queryDetailsForUidTagState.
  Remove unwanted capability code per API council feedback.
This commit is contained in:
Lorenzo Colitti
2018-04-07 02:41:40 +00:00
committed by Android (Google) Code Review
parent 301a925597 53765e00d8
commit 2eae1e3a45
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -27274,7 +27274,6 @@ package android.net {
method public int describeContents();
method public boolean hasCapability(int);
method public boolean hasTransport(int);
method public boolean hasUnwantedCapability(int);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.NetworkRequest> CREATOR;
}
@@ -27283,7 +27282,6 @@ package android.net {
ctor public NetworkRequest.Builder();
method public android.net.NetworkRequest.Builder addCapability(int);
method public android.net.NetworkRequest.Builder addTransportType(int);
method public android.net.NetworkRequest.Builder addUnwantedCapability(int);
method public android.net.NetworkRequest build();
method public android.net.NetworkRequest.Builder removeCapability(int);
method public android.net.NetworkRequest.Builder removeTransportType(int);

8
api/removed.txt
View File

@@ -291,6 +291,14 @@ package android.net {
public static abstract class NetworkBadging.Badging implements java.lang.annotation.Annotation {
}
public class NetworkRequest implements android.os.Parcelable {
method public boolean hasUnwantedCapability(int);
}
public static class NetworkRequest.Builder {
method public android.net.NetworkRequest.Builder addUnwantedCapability(int);
}
public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
}

2
core/java/android/app/usage/NetworkStatsManager.java
View File

@@ -305,6 +305,8 @@ public class NetworkStatsManager {
* {@link java.lang.System#currentTimeMillis}.
* @param uid UID of app
* @param tag TAG of interest. Use {@link NetworkStats.Bucket#TAG_NONE} for no tags.
* @param state state of interest. Use {@link NetworkStats.Bucket#STATE_ALL} to aggregate
* traffic from all states.
* @return Statistics object or null if an error happened during statistics collection.
* @throws SecurityException if permissions are insufficient to read network statistics.
*/

4
core/java/android/net/NetworkRequest.java
View File

@@ -233,6 +233,8 @@ public class NetworkRequest implements Parcelable {
*
* @param capability The capability to add to unwanted capability list.
* @return The builder to facilitate chaining.
*
* @removed
*/
public Builder addUnwantedCapability(@NetworkCapabilities.NetCapability int capability) {
mNetworkCapabilities.addUnwantedCapability(capability);
@@ -439,6 +441,8 @@ public class NetworkRequest implements Parcelable {
/**
* @see Builder#addUnwantedCapability(int)
*
* @removed
*/
public boolean hasUnwantedCapability(@NetCapability int capability) {
return networkCapabilities.hasUnwantedCapability(capability);