Use supported Android network handles in Android M and newer.

net/android/network_change_notifier_delegate_android.cc

 // 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.
 
 #include "net/android/network_change_notifier_delegate_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "jni/NetworkChangeNotifier_jni.h"
@@ skipping 29 matching lines @@
 NetworkChangeNotifier::ConnectionSubtype ConvertConnectionSubtype(
     jint subtype) {
   DCHECK(subtype >= 0 && subtype <= NetworkChangeNotifier::SUBTYPE_LAST);
 
   return static_cast<NetworkChangeNotifier::ConnectionSubtype>(subtype);
 }
 
 }  // namespace
 
 // static
-void NetworkChangeNotifierDelegateAndroid::JavaIntArrayToNetworkMap(
+void NetworkChangeNotifierDelegateAndroid::JavaLongArrayToNetworkMap(
     JNIEnv* env,
-    jintArray int_array,
+    jlongArray long_array,
     NetworkMap* network_map) {
-  std::vector<int> int_list;
-  base::android::JavaIntArrayToIntVector(env, int_array, &int_list);
+  std::vector<int64_t> int64_list;
+  base::android::JavaLongArrayToInt64Vector(env, long_array, &int64_list);
   network_map->clear();
-  for (auto i = int_list.begin(); i != int_list.end(); ++i) {
+  for (auto i = int64_list.begin(); i != int64_list.end(); ++i) {
     NetworkChangeNotifier::NetworkHandle network_handle = *i;
-    CHECK(++i != int_list.end());
+    CHECK(++i != int64_list.end());
     (*network_map)[network_handle] = static_cast<ConnectionType>(*i);
   }
 }
 
 jdouble GetMaxBandwidthForConnectionSubtype(JNIEnv* env,
                                             const JavaParamRef<jclass>& caller,
                                             jint subtype) {
   return NetworkChangeNotifierAndroid::GetMaxBandwidthForConnectionSubtype(
       ConvertConnectionSubtype(subtype));
 }
@@ skipping 10 matching lines @@
   SetCurrentConnectionType(
       ConvertConnectionType(
           Java_NetworkChangeNotifier_getCurrentConnectionType(
               env, java_network_change_notifier_.obj())));
   SetCurrentMaxBandwidth(
       Java_NetworkChangeNotifier_getCurrentMaxBandwidthInMbps(
           env, java_network_change_notifier_.obj()));
   SetCurrentDefaultNetwork(Java_NetworkChangeNotifier_getCurrentDefaultNetId(
       env, java_network_change_notifier_.obj()));
   NetworkMap network_map;
-  ScopedJavaLocalRef<jintArray> networks_and_types =
+  ScopedJavaLocalRef<jlongArray> networks_and_types =
       Java_NetworkChangeNotifier_getCurrentNetworksAndTypes(
           env, java_network_change_notifier_.obj());
-  JavaIntArrayToNetworkMap(env, networks_and_types.obj(), &network_map);
+  JavaLongArrayToNetworkMap(env, networks_and_types.obj(), &network_map);
   SetCurrentNetworksAndTypes(network_map);
 }
 
 NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_->AssertEmpty();
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_removeNativeObserver(
       env, java_network_change_notifier_.obj(),
       reinterpret_cast<intptr_t>(this));
@@ skipping 44 matching lines @@
   network_list->clear();
   base::AutoLock auto_lock(connection_lock_);
   for (auto i : network_map_)
     network_list->push_back(i.first);
 }
 
 void NetworkChangeNotifierDelegateAndroid::NotifyConnectionTypeChanged(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint new_connection_type,
-    jint default_netid) {
+    jlong default_netid) {
   DCHECK(thread_checker_.CalledOnValidThread());
   const ConnectionType actual_connection_type = ConvertConnectionType(
       new_connection_type);
   SetCurrentConnectionType(actual_connection_type);
   NetworkHandle default_network = default_netid;
   if (default_network != GetCurrentDefaultNetwork()) {
     SetCurrentDefaultNetwork(default_network);
     bool default_exists;
     {
       base::AutoLock auto_lock(connection_lock_);
@@ skipping 28 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   SetCurrentMaxBandwidth(new_max_bandwidth);
   observers_->Notify(FROM_HERE, &Observer::OnMaxBandwidthChanged,
                      new_max_bandwidth, GetCurrentConnectionType());
 }
 
 void NetworkChangeNotifierDelegateAndroid::NotifyOfNetworkConnect(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    jint net_id,
+    jlong net_id,
     jint connection_type) {
   DCHECK(thread_checker_.CalledOnValidThread());
   NetworkHandle network = net_id;
   bool already_exists;
   {
     base::AutoLock auto_lock(connection_lock_);
     already_exists = network_map_.find(network) != network_map_.end();
     network_map_[network] = static_cast<ConnectionType>(connection_type);
   }
   // Android Lollipop would send many duplicate notifications.
   // This was later fixed in Android Marshmallow.
   // Deduplicate them here by avoiding sending duplicate notifications.
   if (!already_exists) {
     observers_->Notify(FROM_HERE, &Observer::OnNetworkConnected, network);
     if (network == GetCurrentDefaultNetwork()) {
       observers_->Notify(FROM_HERE, &Observer::OnNetworkMadeDefault, network);
     }
   }
 }
 
 void NetworkChangeNotifierDelegateAndroid::NotifyOfNetworkSoonToDisconnect(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    jint net_id) {
+    jlong net_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   NetworkHandle network = net_id;
   {
     base::AutoLock auto_lock(connection_lock_);
     if (network_map_.find(network) == network_map_.end())
       return;
   }
   observers_->Notify(FROM_HERE, &Observer::OnNetworkSoonToDisconnect, network);
 }
 
 void NetworkChangeNotifierDelegateAndroid::NotifyOfNetworkDisconnect(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    jint net_id) {
+    jlong net_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   NetworkHandle network = net_id;
   {
     base::AutoLock auto_lock(connection_lock_);
     if (network == default_network_)
       default_network_ = NetworkChangeNotifier::kInvalidNetworkHandle;
     if (network_map_.erase(network) == 0)
       return;
   }
   observers_->Notify(FROM_HERE, &Observer::OnNetworkDisconnected, network);
 }
 
 void NetworkChangeNotifierDelegateAndroid::NotifyPurgeActiveNetworkList(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jintArray>& active_networks) {
+    const JavaParamRef<jlongArray>& active_networks) {
   DCHECK(thread_checker_.CalledOnValidThread());
   NetworkList active_network_list;
-  base::android::JavaIntArrayToIntVector(env, active_networks,
-                                         &active_network_list);
+  base::android::JavaLongArrayToInt64Vector(env, active_networks,
+                                            &active_network_list);
   NetworkList disconnected_networks;
   {
     base::AutoLock auto_lock(connection_lock_);
     for (auto i : network_map_) {
       bool found = false;
       for (auto j : active_network_list) {
         if (j == i.first) {
           found = true;
           break;
         }
@@ skipping 72 matching lines @@
 void NetworkChangeNotifierDelegateAndroid::FakeNetworkDisconnected(
     NetworkChangeNotifier::NetworkHandle network) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_fakeNetworkDisconnected(env, network);
 }
 
 void NetworkChangeNotifierDelegateAndroid::FakePurgeActiveNetworkList(
     NetworkChangeNotifier::NetworkList networks) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_fakePurgeActiveNetworkList(
-      env, base::android::ToJavaIntArray(env, networks).obj());
+      env, base::android::ToJavaLongArray(env, networks).obj());
 }
 
 void NetworkChangeNotifierDelegateAndroid::FakeDefaultNetwork(
     NetworkChangeNotifier::NetworkHandle network,
     ConnectionType type) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_fakeDefaultNetwork(env, network, type);
 }
 
 void NetworkChangeNotifierDelegateAndroid::FakeMaxBandwidthChanged(
     double max_bandwidth_mbps) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_fakeMaxBandwidthChanged(env, max_bandwidth_mbps);
 }
 
 }  // namespace net