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

Merge changes Ieef54d84,Ica3e88c2 am: 491f53523a am: 8e4ce11318

Browse Source 
am: c904972acd

Change-Id: Idcc18b95951c566335431a493ed7b9d49477a4c0
This commit is contained in:
Remi NGUYEN VAN
2019-01-22 05:32:01 -08:00
committed by android-build-merger
parent cf0bfd9885 c904972acd
commit b809148b9a
10 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/net/metrics/IpConnectivityLog.java
View File

@@ -21,6 +21,7 @@ import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.net.ConnectivityMetricsEvent;
import android.net.IIpConnectivityMetrics;
import android.net.Network;
import android.os.Parcelable;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -126,6 +127,18 @@ public class IpConnectivityLog {
return log(ev);
}
/**
* Log an IpConnectivity event.
* @param network the network associated with the event.
* @param transports the current transports of the network associated with the event, as defined
* in NetworkCapabilities.
* @param data is a Parcelable instance representing the event.
* @return true if the event was successfully logged.
*/
public boolean log(Network network, int[] transports, Event data) {
return log(network.netId, transports, data);
}
/**
* Log an IpConnectivity event.
* @param netid the id of the network associated with the event.

3
core/java/android/os/ServiceSpecificException.java
View File

@@ -15,6 +15,8 @@
*/
package android.os;
import android.annotation.SystemApi;
/**
* An exception specific to a service.
*
@@ -28,6 +30,7 @@ package android.os;
*
* @hide
*/
@SystemApi
public class ServiceSpecificException extends RuntimeException {
public final int errorCode;

2
core/java/com/android/internal/util/Protocol.java
View File

@@ -53,7 +53,6 @@ public class Protocol {
public static final int BASE_WIFI_PASSPOINT_MANAGER = 0x00028000;
public static final int BASE_WIFI_PASSPOINT_SERVICE = 0x00028100;
public static final int BASE_WIFI_LOGGER = 0x00028300;
public static final int BASE_DHCP = 0x00030000;
public static final int BASE_DATA_CONNECTION = 0x00040000;
public static final int BASE_DATA_CONNECTION_AC = 0x00041000;
public static final int BASE_DATA_CONNECTION_TRACKER = 0x00042000;
@@ -62,7 +61,6 @@ public class Protocol {
public static final int BASE_NETWORK_STATE_TRACKER = 0x00070000;
public static final int BASE_CONNECTIVITY_MANAGER = 0x00080000;
public static final int BASE_NETWORK_AGENT = 0x00081000;
public static final int BASE_NETWORK_MONITOR = 0x00082000;
public static final int BASE_NETWORK_FACTORY = 0x00083000;
public static final int BASE_ETHERNET = 0x00084000;
public static final int BASE_LOWPAN = 0x00085000;