Use supported Android network handles in Android M and newer.

net/android/network_change_notifier_delegate_android.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_ANDROID_H_
 #define NET_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_ANDROID_H_
 
 #include <string>
 
 #include "base/android/jni_android.h"
@@ skipping 36 matching lines @@
   ~NetworkChangeNotifierDelegateAndroid();
 
   // Called from NetworkChangeNotifier.java on the JNI thread whenever
   // the connection type changes. This updates the current connection type seen
   // by this class and forwards the notification to the observers that
   // subscribed through AddObserver().
   void NotifyConnectionTypeChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       jint new_connection_type,
-      jint default_netid);
+      jlong default_netid);
   jint GetConnectionType(JNIEnv* env, jobject obj) const;
 
   // Called from NetworkChangeNotifier.java on the JNI thread whenever
   // the maximum bandwidth of the connection changes. This updates the current
   // max bandwidth seen by this class and forwards the notification to the
   // observers that subscribed through AddObserver().
   void NotifyMaxBandwidthChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       jdouble new_max_bandwidth);
 
   // Called from NetworkChangeNotifier.java on the JNI thread to push
   // down notifications of network connectivity events. These functions in
   // turn:
   //   1) Update |network_map_| and |default_network_|.
   //   2) Push notifications to NetworkChangeNotifier which in turn pushes
   //      notifications to its NetworkObservers. Note that these functions
   //      perform valuable transformations on the signals like deduplicating.
   // For descriptions of what individual calls mean, see
   // NetworkChangeNotifierAutoDetect.Observer functions of the same names.
   void NotifyOfNetworkConnect(JNIEnv* env,
                               const base::android::JavaParamRef<jobject>& obj,
-                              jint net_id,
+                              jlong net_id,
                               jint connection_type);
   void NotifyOfNetworkSoonToDisconnect(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      jint net_id);
+      jlong net_id);
   void NotifyOfNetworkDisconnect(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      jint net_id);
+      jlong net_id);
   void NotifyPurgeActiveNetworkList(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      const base::android::JavaParamRef<jintArray>& active_networks);
+      const base::android::JavaParamRef<jlongArray>& active_networks);
 
   // These methods can be called on any thread. Note that the provided observer
   // will be notified on the thread AddObserver() is called on.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // These methods are simply implementations of NetworkChangeNotifier APIs of
   // the same name. They can be called from any thread.
   ConnectionType GetCurrentConnectionType() const;
   void GetCurrentMaxBandwidthAndConnectionType(
       double* max_bandwidth_mbps,
       ConnectionType* connection_type) const;
   ConnectionType GetNetworkConnectionType(NetworkHandle network) const;
   NetworkHandle GetCurrentDefaultNetwork() const;
   void GetCurrentlyConnectedNetworks(NetworkList* network_list) const;
 
   // Can only be called from the main (Java) thread.
   NetworkChangeNotifier::ConnectionSubtype GetCurrentConnectionSubtype() const;
 
   // Initializes JNI bindings.
   static bool Register(JNIEnv* env);
 
  private:
   friend class BaseNetworkChangeNotifierAndroidTest;
 
   // Map of active connected networks and their connection type.
   typedef std::map<NetworkHandle, ConnectionType> NetworkMap;
 
-  // Converts a Java int[] into a NetworkMap. Expects int[] to contain
+  // Converts a Java long[] into a NetworkMap. Expects long[] to contain
   // repeated instances of: NetworkHandle, ConnectionType
-  static void JavaIntArrayToNetworkMap(JNIEnv* env,
-                                       jintArray int_array,
-                                       NetworkMap* network_map);
+  static void JavaLongArrayToNetworkMap(JNIEnv* env,
+                                        jlongArray long_array,
+                                        NetworkMap* network_map);
 
   // Setters that grab appropriate lock.
   void SetCurrentConnectionType(ConnectionType connection_type);
   void SetCurrentMaxBandwidth(double max_bandwidth);
   void SetCurrentDefaultNetwork(NetworkHandle default_network);
   void SetCurrentNetworksAndTypes(NetworkMap network_map);
 
   // Methods calling the Java side exposed for testing.
   void SetOnline();
   void SetOffline();
@@ skipping 13 matching lines @@
   double connection_max_bandwidth_;
   NetworkHandle default_network_;
   NetworkMap network_map_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierDelegateAndroid);
 };
 
 }  // namespace net
 
 #endif  // NET_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_ANDROID_H_