Remove outdated devices from Android device chooser

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

 // Copyright 2015 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.
 
 package org.chromium.device.bluetooth;
 
 import android.Manifest;
 import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.le.ScanSettings;
@@ skipping 18 matching lines @@
  * Lifetime is controlled by device::BluetoothAdapterAndroid.
  */
 @JNINamespace("device")
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 final class ChromeBluetoothAdapter extends BroadcastReceiver {
     private static final String TAG = "Bluetooth";
 
     private long mNativeBluetoothAdapterAndroid;
     // mAdapter is final to ensure registerReceiver is followed by unregisterReceiver.
     private final Wrappers.BluetoothAdapterWrapper mAdapter;
-    private int mNumDiscoverySessions;
     private ScanCallback mScanCallback;
 
     // ---------------------------------------------------------------------------------------------
     // Construction and handler for C++ object destruction.
 
     /**
      * Constructs a ChromeBluetoothAdapter.
      * @param nativeBluetoothAdapterAndroid Is the associated C++
      *                                      BluetoothAdapterAndroid pointer value.
      * @param adapterWrapper Wraps the default android.bluetooth.BluetoothAdapter,
@@ skipping 86 matching lines @@
     }
 
     // Implements BluetoothAdapterAndroid::IsDiscovering.
     @CalledByNative
     private boolean isDiscovering() {
         return isPresent() && (mAdapter.isDiscovering() || mScanCallback != null);
     }
 
     // Implements BluetoothAdapterAndroid::AddDiscoverySession.
     @CalledByNative
     private boolean addDiscoverySession() {

[ortuno, 2016/06/15 17:20:16]

This function seems less useful now. Make startScan public and call it from
BluetoothAdapterAndroid directly. Same with stopScan().

[perja, 2016/06/17 13:39:27]

Done.

-        if (!isPowered()) {
-            Log.d(TAG, "addDiscoverySession: Fails: !isPowered");
-            return false;
-        }
-
-        mNumDiscoverySessions++;
-        Log.d(TAG, "addDiscoverySession: Now %d sessions.", mNumDiscoverySessions);
-        if (mNumDiscoverySessions > 1) {
-            return true;
-        }
-
-        if (!startScan()) {
-            mNumDiscoverySessions--;
-            return false;
-        }
-        return true;
+        return startScan();
     }
 
     // Implements BluetoothAdapterAndroid::RemoveDiscoverySession.
     @CalledByNative
     private boolean removeDiscoverySession() {
-        if (mNumDiscoverySessions == 0) {
-            assert false;
-            Log.w(TAG, "removeDiscoverySession: No scan in progress.");
-            return false;
-        }
-
-        --mNumDiscoverySessions;
-
-        if (mNumDiscoverySessions == 0) {
-            Log.d(TAG, "removeDiscoverySession: Now 0 sessions. Stopping scan.");
-            return stopScan();
-        }
-
-        Log.d(TAG, "removeDiscoverySession: Now %d sessions.", mNumDiscoverySessions);
-        return true;
+        return stopScan();
     }
 
     // ---------------------------------------------------------------------------------------------
     // Implementation details:
 
     /**
      * @return true if Chromium has permission to scan for Bluetooth devices.
      */
     private boolean canScan() {
         Wrappers.ContextWrapper context = mAdapter.getContext();
@@ skipping 91 matching lines @@
             List<ParcelUuid> uuids = result.getScanRecord_getServiceUuids();
 
             nativeCreateOrUpdateDeviceOnScan(mNativeBluetoothAdapterAndroid,
                     result.getDevice().getAddress(), result.getDevice(), uuids);
         }
 
         @Override
         public void onScanFailed(int errorCode) {
             Log.w(TAG, "onScanFailed: %d", errorCode);
             nativeOnScanFailed(mNativeBluetoothAdapterAndroid);
-            mNumDiscoverySessions = 0;
         }
     }
 
     @Override
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
 
         if (isPresent() && BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
             int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
 
@@ skipping 39 matching lines @@
     // 'Object' type must be used for |bluetoothDeviceWrapper| because inner class
     // Wrappers.BluetoothDeviceWrapper reference is not handled by jni_generator.py JavaToJni.
     // http://crbug.com/505554
     private native void nativeCreateOrUpdateDeviceOnScan(long nativeBluetoothAdapterAndroid,
             String address, Object bluetoothDeviceWrapper, List<ParcelUuid> advertisedUuids);
 
     // Binds to BluetoothAdapterAndroid::nativeOnAdapterStateChanged
     private native void nativeOnAdapterStateChanged(
             long nativeBluetoothAdapterAndroid, boolean powered);
 }