Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea (ca312c1c) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothAdapter.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -1183,6 +1183,25 @@ public final class BluetoothAdapter {
		}
		}

		/**
		* Get the end time of the latest remote device discovery process.
		* @return the latest time that the bluetooth adapter was/will be in discovery mode,
		* in milliseconds since the epoch.
		* This time can be in the future if {@link #startDiscovery()} has been called recently.
		* @hide
		*/
		public long getDiscoveryEndMillis() {
		try {
		mServiceLock.readLock().lock();
		if (mService != null) return mService.getDiscoveryEndMillis();
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		} finally {
		mServiceLock.readLock().unlock();
		}
		return -1;
		}

		/**
		* Start the remote device discovery process.
		* <p>The discovery process usually involves an inquiry scan of about 12

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ interface IBluetooth
		boolean startDiscovery();
		boolean cancelDiscovery();
		boolean isDiscovering();
		long getDiscoveryEndMillis();

		int getAdapterConnectionState();
		int getProfileConnectionState(int profile);

+4 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,10 @@ public final class LocalBluetoothAdapter {
		mAdapter.setDiscoverableTimeout(timeout);
		}

		public long getDiscoveryEndMillis() {
		return mAdapter.getDiscoveryEndMillis();
		}

		public void setName(String name) {
		mAdapter.setName(name);
		}