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

am: c904972acd

Change-Id: Idcc18b95951c566335431a493ed7b9d49477a4c0

core/java/android/net/metrics/IpConnectivityLog.java

@@ -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.

core/java/android/os/ServiceSpecificException.java

@@ -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;