Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras."

core/java/android/net/ConnectivityDiagnosticsManager.java

@@ -676,7 +676,8 @@ public class ConnectivityDiagnosticsManager {
         }
 
         try {
-            mService.registerConnectivityDiagnosticsCallback(binder, request);
+            mService.registerConnectivityDiagnosticsCallback(
+                    binder, request, mContext.getOpPackageName());
         } catch (RemoteException exception) {
             exception.rethrowFromSystemServer();
         }

core/java/android/net/IConnectivityManager.aidl

@@ -221,7 +221,7 @@ interface IConnectivityManager
     boolean isCallerCurrentAlwaysOnVpnLockdownApp();
 
     void registerConnectivityDiagnosticsCallback(in IConnectivityDiagnosticsCallback callback,
-            in NetworkRequest request);
+            in NetworkRequest request, String callingPackageName);
     void unregisterConnectivityDiagnosticsCallback(in IConnectivityDiagnosticsCallback callback);
 
     IBinder startOrGetTestNetworkService();

core/java/android/net/NetworkCapabilities.java

@@ -858,8 +858,8 @@ public final class NetworkCapabilities implements Parcelable {
      *
      * <p>In general, user-supplied networks (such as WiFi networks) do not have an administrator.
      *
-     * <p>An app is granted owner privileges over Networks that it supplies. Owner privileges
-     * implicitly include administrator privileges.
+     * <p>An app is granted owner privileges over Networks that it supplies. The owner UID MUST
+     * always be included in administratorUids.
      *
      * @param administratorUids the UIDs to be set as administrators of this Network.
      * @hide