Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD (08749897) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothActivityEnergyInfo.java

+35 −16

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ package android.bluetooth;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.util.Arrays;

		/**
		* Record of energy and activity information from controller and
		* underlying bt stack state.Timestamp the record with system
		@@ -27,11 +29,12 @@ import android.os.Parcelable;
		*/
		public final class BluetoothActivityEnergyInfo implements Parcelable {
		private final long mTimestamp;
		private final int mBluetoothStackState;
		private final long mControllerTxTimeMs;
		private final long mControllerRxTimeMs;
		private final long mControllerIdleTimeMs;
		private final long mControllerEnergyUsed;
		private int mBluetoothStackState;
		private long mControllerTxTimeMs;
		private long mControllerRxTimeMs;
		private long mControllerIdleTimeMs;
		private long mControllerEnergyUsed;
		private UidTraffic[] mUidTraffic;

		public static final int BT_STACK_STATE_INVALID = 0;
		public static final int BT_STACK_STATE_STATE_ACTIVE = 1;
		@@ -48,6 +51,17 @@ public final class BluetoothActivityEnergyInfo implements Parcelable {
		mControllerEnergyUsed = energyUsed;
		}

		@SuppressWarnings("unchecked")
		BluetoothActivityEnergyInfo(Parcel in) {
		mTimestamp = in.readLong();
		mBluetoothStackState = in.readInt();
		mControllerTxTimeMs = in.readLong();
		mControllerRxTimeMs = in.readLong();
		mControllerIdleTimeMs = in.readLong();
		mControllerEnergyUsed = in.readLong();
		mUidTraffic = in.createTypedArray(UidTraffic.CREATOR);
		}

		@Override
		public String toString() {
		return "BluetoothActivityEnergyInfo{"
		@@ -57,26 +71,22 @@ public final class BluetoothActivityEnergyInfo implements Parcelable {
		+ " mControllerRxTimeMs=" + mControllerRxTimeMs
		+ " mControllerIdleTimeMs=" + mControllerIdleTimeMs
		+ " mControllerEnergyUsed=" + mControllerEnergyUsed
		+ " mUidTraffic=" + Arrays.toString(mUidTraffic)
		+ " }";
		}

		public static final Parcelable.Creator<BluetoothActivityEnergyInfo> CREATOR =
		new Parcelable.Creator<BluetoothActivityEnergyInfo>() {
		public BluetoothActivityEnergyInfo createFromParcel(Parcel in) {
		long timestamp = in.readLong();
		int stackState = in.readInt();
		long txTime = in.readLong();
		long rxTime = in.readLong();
		long idleTime = in.readLong();
		long energyUsed = in.readLong();
		return new BluetoothActivityEnergyInfo(timestamp, stackState,
		txTime, rxTime, idleTime, energyUsed);
		return new BluetoothActivityEnergyInfo(in);
		}

		public BluetoothActivityEnergyInfo[] newArray(int size) {
		return new BluetoothActivityEnergyInfo[size];
		}
		};

		@SuppressWarnings("unchecked")
		public void writeToParcel(Parcel out, int flags) {
		out.writeLong(mTimestamp);
		out.writeInt(mBluetoothStackState);
		@@ -84,6 +94,7 @@ public final class BluetoothActivityEnergyInfo implements Parcelable {
		out.writeLong(mControllerRxTimeMs);
		out.writeLong(mControllerIdleTimeMs);
		out.writeLong(mControllerEnergyUsed);
		out.writeTypedArray(mUidTraffic, flags);
		}

		public int describeContents() {
		@@ -133,12 +144,20 @@ public final class BluetoothActivityEnergyInfo implements Parcelable {
		return mTimestamp;
		}

		public UidTraffic[] getUidTraffic() {
		return mUidTraffic;
		}

		public void setUidTraffic(UidTraffic[] traffic) {
		mUidTraffic = traffic;
		}

		/**
		* @return if the record is valid
		*/
		public boolean isValid() {
		return ((mControllerTxTimeMs !=0) \|\|
		(mControllerRxTimeMs !=0) \|\|
		(mControllerIdleTimeMs !=0));
		return ((mControllerTxTimeMs >=0) &&
		(mControllerRxTimeMs >=0) &&
		(mControllerIdleTimeMs >=0));
		}
		}

framework/java/android/bluetooth/BluetoothAdapter.java

+47 −49

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009-2015 The Android Open Source Project
		* Copyright (C) 2009-2016 The Android Open Source Project
		* Copyright (C) 2015 Samsung LSI
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		@@ -31,11 +31,14 @@ import android.bluetooth.le.ScanRecord;
		import android.bluetooth.le.ScanResult;
		import android.bluetooth.le.ScanSettings;
		import android.content.Context;
		import android.os.BatteryStats;
		import android.os.Binder;
		import android.os.IBinder;
		import android.os.ParcelUuid;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ServiceManager;
		import android.os.SynchronousResultReceiver;
		import android.os.SystemProperties;
		import android.util.Log;
		import android.util.Pair;
		@@ -67,9 +70,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
		* <p>To get a {@link BluetoothAdapter} representing the local Bluetooth
		* adapter, when running on JELLY_BEAN_MR1 and below, call the
		* static {@link #getDefaultAdapter} method; when running on JELLY_BEAN_MR2 and
		* higher, retrieve it through
		* {@link android.content.Context#getSystemService} with
		* {@link android.content.Context#BLUETOOTH_SERVICE}.
		* higher, call {@link BluetoothManager#getAdapter}.
		* Fundamentally, this is your starting point for all
		* Bluetooth actions. Once you have the local adapter, you can get a set of
		* {@link BluetoothDevice} objects representing all paired devices with
		@@ -472,12 +473,6 @@ public final class BluetoothAdapter {

		private static final int ADDRESS_LENGTH = 17;

		private static final int CONTROLLER_ENERGY_UPDATE_TIMEOUT_MILLIS = 30;
		/** @hide */
		public static final int ACTIVITY_ENERGY_INFO_CACHED = 0;
		/** @hide */
		public static final int ACTIVITY_ENERGY_INFO_REFRESHED = 1;

		/**
		* Lazily initialized singleton. Guaranteed final after first object
		* constructed.
		@@ -902,28 +897,10 @@ public final class BluetoothAdapter {
		*/
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean enable() {
		int state = BluetoothAdapter.STATE_OFF;
		if (isEnabled() == true) {
		if (DBG) Log.d(TAG, "enable(): BT is already enabled..!");
		return true;
		}
		// Use service interface to get the exact state
		try {
		mServiceLock.readLock().lock();
		if (mService != null) {
		state = mService.getState();
		}
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		} finally {
		mServiceLock.readLock().unlock();
		}

		if (state == BluetoothAdapter.STATE_BLE_ON) {
		Log.e(TAG, "BT is in BLE_ON State");
		notifyUserAction(true);
		return true;
		}
		try {
		return mManagerService.enable();
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		@@ -1441,38 +1418,52 @@ public final class BluetoothAdapter {
		*
		* @return a record with {@link BluetoothActivityEnergyInfo} or null if
		* report is unavailable or unsupported
		* @deprecated use the asynchronous
		* {@link #requestControllerActivityEnergyInfo(ResultReceiver)} instead.
		* @hide
		*/
		@Deprecated
		public BluetoothActivityEnergyInfo getControllerActivityEnergyInfo(int updateType) {
		if (getState() != STATE_ON) return null;
		SynchronousResultReceiver receiver = new SynchronousResultReceiver();
		requestControllerActivityEnergyInfo(receiver);
		try {
		mServiceLock.readLock().lock();
		BluetoothActivityEnergyInfo record;
		if (mService != null) {
		if (!mService.isActivityAndEnergyReportingSupported()) {
		return null;
		}
		SynchronousResultReceiver.Result result = receiver.awaitResult(1000);
		if (result.bundle != null) {
		return result.bundle.getParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY);
		}
		synchronized(this) {
		if (updateType == ACTIVITY_ENERGY_INFO_REFRESHED) {
		mService.getActivityEnergyInfoFromController();
		wait(CONTROLLER_ENERGY_UPDATE_TIMEOUT_MILLIS);
		} catch (TimeoutException e) {
		Log.e(TAG, "getControllerActivityEnergyInfo timed out");
		}
		record = mService.reportActivityInfo();
		if (record.isValid()) {
		return record;
		} else {
		return null;
		}

		/**
		* Request the record of {@link BluetoothActivityEnergyInfo} object that
		* has the activity and energy info. This can be used to ascertain what
		* the controller has been up to, since the last sample.
		*
		* A null value for the activity info object may be sent if the bluetooth service is
		* unreachable or the device does not support reporting such information.
		*
		* @param result The callback to which to send the activity info.
		* @hide
		*/
		public void requestControllerActivityEnergyInfo(ResultReceiver result) {
		try {
		mServiceLock.readLock().lock();
		if (mService != null) {
		mService.requestActivityInfo(result);
		result = null;
		}
		} catch (InterruptedException e) {
		Log.e(TAG, "getControllerActivityEnergyInfoCallback wait interrupted: " + e);
		} catch (RemoteException e) {
		Log.e(TAG, "getControllerActivityEnergyInfoCallback: " + e);
		} finally {
		mServiceLock.readLock().unlock();
		if (result != null) {
		// Only send an immediate result if we failed.
		result.send(0, null);
		}
		}
		return null;
		}

		/**
		@@ -1931,6 +1922,9 @@ public final class BluetoothAdapter {
		} else if (profile == BluetoothProfile.SAP) {
		BluetoothSap sap = new BluetoothSap(context, listener);
		return true;
		} else if (profile == BluetoothProfile.PBAP_CLIENT) {
		BluetoothPbapClient pbapClient = new BluetoothPbapClient(context, listener);
		return true;
		} else {
		return false;
		}
		@@ -1999,6 +1993,10 @@ public final class BluetoothAdapter {
		BluetoothSap sap = (BluetoothSap)proxy;
		sap.close();
		break;
		case BluetoothProfile.PBAP_CLIENT:
		BluetoothPbapClient pbapClient = (BluetoothPbapClient)proxy;
		pbapClient.close();
		break;
		}
		}

		@@ -2276,7 +2274,7 @@ public final class BluetoothAdapter {
		@Deprecated
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean startLeScan(final UUID[] serviceUuids, final LeScanCallback callback) {
		if (DBG) Log.d(TAG, "startLeScan(): " + serviceUuids);
		if (DBG) Log.d(TAG, "startLeScan(): " + Arrays.toString(serviceUuids));
		if (callback == null) {
		if (DBG) Log.e(TAG, "startLeScan: null callback");
		return false;

framework/java/android/bluetooth/BluetoothHeadsetClientCall.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable {

		public String toString(boolean loggable) {
		StringBuilder builder = new StringBuilder("BluetoothHeadsetClientCall{mDevice: ");
		builder.append(loggable ? mDevice.hashCode() : mDevice);
		builder.append(loggable ? mDevice : mDevice.hashCode());
		builder.append(", mId: ");
		builder.append(mId);
		builder.append(", mUUID: ");
		@@ -214,7 +214,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		default: builder.append(mState); break;
		}
		builder.append(", mNumber: ");
		builder.append(loggable ? mNumber.hashCode() : mNumber);
		builder.append(loggable ? mNumber : mNumber.hashCode());
		builder.append(", mMultiParty: ");
		builder.append(mMultiParty);
		builder.append(", mOutgoing: ");

framework/java/android/bluetooth/BluetoothPbapClient.java

0 → 100644

+391 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.bluetooth;

		import java.util.List;
		import java.util.ArrayList;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.ServiceConnection;
		import android.os.RemoteException;
		import android.os.IBinder;
		import android.util.Log;

		/**
		* This class provides the APIs to control the Bluetooth PBAP Client Profile.
		*@hide
		*/
		public final class BluetoothPbapClient implements BluetoothProfile {

		private static final String TAG = "BluetoothPbapClient";
		private static final boolean DBG = false;
		private static final boolean VDBG = false;

		public static final String ACTION_CONNECTION_STATE_CHANGED =
		"android.bluetooth.pbap.profile.action.CONNECTION_STATE_CHANGED";

		private IBluetoothPbapClient mService;
		private final Context mContext;
		private ServiceListener mServiceListener;
		private BluetoothAdapter mAdapter;

		/** There was an error trying to obtain the state */
		public static final int STATE_ERROR = -1;

		public static final int RESULT_FAILURE = 0;
		public static final int RESULT_SUCCESS = 1;
		/** Connection canceled before completion. */
		public static final int RESULT_CANCELED = 2;

		final private IBluetoothStateChangeCallback mBluetoothStateChangeCallback =
		new IBluetoothStateChangeCallback.Stub() {
		public void onBluetoothStateChange(boolean up) {
		if (DBG) {
		Log.d(TAG, "onBluetoothStateChange: PBAP CLIENT up=" + up);
		}
		if (!up) {
		if (VDBG) {
		Log.d(TAG,"Unbinding service...");
		}
		synchronized (mConnection) {
		try {
		mService = null;
		mContext.unbindService(mConnection);
		} catch (Exception re) {
		Log.e(TAG,"",re);
		}
		}
		} else {
		synchronized (mConnection) {
		try {
		if (mService == null) {
		if (VDBG) {
		Log.d(TAG,"Binding service...");
		}
		doBind();
		}
		} catch (Exception re) {
		Log.e(TAG,"",re);
		}
		}
		}
		}
		};

		/**
		* Create a BluetoothPbapClient proxy object.
		*/
		BluetoothPbapClient(Context context, ServiceListener l) {
		if (DBG) {
		Log.d(TAG, "Create BluetoothPbapClient proxy object");
		}
		mContext = context;
		mServiceListener = l;
		mAdapter = BluetoothAdapter.getDefaultAdapter();
		IBluetoothManager mgr = mAdapter.getBluetoothManager();
		if (mgr != null) {
		try {
		mgr.registerStateChangeCallback(mBluetoothStateChangeCallback);
		} catch (RemoteException e) {
		Log.e(TAG,"",e);
		}
		}
		doBind();
		}

		private boolean doBind() {
		Intent intent = new Intent(IBluetoothPbapClient.class.getName());
		ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);
		intent.setComponent(comp);
		if (comp == null \|\| !mContext.bindServiceAsUser(intent, mConnection, 0,
		android.os.Process.myUserHandle())) {
		Log.e(TAG, "Could not bind to Bluetooth PBAP Client Service with " + intent);
		return false;
		}
		return true;
		}

		protected void finalize() throws Throwable {
		try {
		close();
		} finally {
		super.finalize();
		}
		}

		/**
		* Close the connection to the backing service.
		* Other public functions of BluetoothPbapClient will return default error
		* results once close() has been called. Multiple invocations of close()
		* are ok.
		*/
		public synchronized void close() {
		IBluetoothManager mgr = mAdapter.getBluetoothManager();
		if (mgr != null) {
		try {
		mgr.unregisterStateChangeCallback(mBluetoothStateChangeCallback);
		} catch (Exception e) {
		Log.e(TAG,"",e);
		}
		}

		synchronized (mConnection) {
		if (mService != null) {
		try {
		mService = null;
		mContext.unbindService(mConnection);
		} catch (Exception re) {
		Log.e(TAG,"",re);
		}
		}
		}
		mServiceListener = null;
		}

		/**
		* Initiate connection.
		* Upon successful connection to remote PBAP server the Client will
		* attempt to automatically download the users phonebook and call log.
		*
		* @param device a remote device we want connect to
		* @return <code>true</code> if command has been issued successfully;
		* <code>false</code> otherwise;
		*/
		public boolean connect(BluetoothDevice device) {
		if (DBG) {
		log("connect(" + device + ") for PBAP Client.");
		}
		if (mService != null && isEnabled() && isValidDevice(device)) {
		try {
		return mService.connect(device);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return false;
		}
		}
		if (mService == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return false;
		}

		/**
		* Initiate disconnect.
		*
		* @param device Remote Bluetooth Device
		* @return false on error,
		* true otherwise
		*/
		public boolean disconnect(BluetoothDevice device) {
		if (DBG) {
		log("disconnect(" + device + ")" + new Exception() );
		}
		if (mService != null && isEnabled() && isValidDevice(device)) {
		try {
		mService.disconnect(device);
		return true;
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return false;
		}
		}
		if (mService == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return false;
		}

		/**
		* Get the list of connected devices.
		* Currently at most one.
		*
		* @return list of connected devices
		*/
		@Override
		public List<BluetoothDevice> getConnectedDevices() {
		if (DBG) {
		log("getConnectedDevices()");
		}
		if (mService != null && isEnabled()) {
		try {
		return mService.getConnectedDevices();
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return new ArrayList<BluetoothDevice>();
		}
		}
		if (mService == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return new ArrayList<BluetoothDevice>();
		}

		/**
		* Get the list of devices matching specified states. Currently at most one.
		*
		* @return list of matching devices
		*/
		@Override
		public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
		if (DBG) {
		log("getDevicesMatchingStates()");
		}
		if (mService != null && isEnabled()) {
		try {
		return mService.getDevicesMatchingConnectionStates(states);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return new ArrayList<BluetoothDevice>();
		}
		}
		if (mService == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return new ArrayList<BluetoothDevice>();
		}

		/**
		* Get connection state of device
		*
		* @return device connection state
		*/
		@Override
		public int getConnectionState(BluetoothDevice device) {
		if (DBG) {
		log("getConnectionState(" + device + ")");
		}
		if (mService != null && isEnabled() && isValidDevice(device)) {
		try {
		return mService.getConnectionState(device);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return BluetoothProfile.STATE_DISCONNECTED;
		}
		}
		if (mService == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return BluetoothProfile.STATE_DISCONNECTED;
		}

		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) {
		log("Proxy object connected");
		}
		mService = IBluetoothPbapClient.Stub.asInterface(service);
		if (mServiceListener != null) {
		mServiceListener.onServiceConnected(BluetoothProfile.PBAP_CLIENT, BluetoothPbapClient.this);
		}
		}
		public void onServiceDisconnected(ComponentName className) {
		if (DBG) {
		log("Proxy object disconnected");
		}
		mService = null;
		if (mServiceListener != null) {
		mServiceListener.onServiceDisconnected(BluetoothProfile.PBAP_CLIENT);
		}
		}
		};

		private static void log(String msg) {
		Log.d(TAG, msg);
		}

		private boolean isEnabled() {
		BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
		if (adapter != null && adapter.getState() == BluetoothAdapter.STATE_ON) {
		return true;
		}
		log("Bluetooth is Not enabled");
		return false;
		}

		private boolean isValidDevice(BluetoothDevice device) {
		if (device == null) {
		return false;
		}
		if (BluetoothAdapter.checkBluetoothAddress(device.getAddress())) {
		return true;
		}
		return false;
		}

		/**
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link #PRIORITY_ON} or
		* {@link #PRIORITY_OFF},
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		*/
		public boolean setPriority(BluetoothDevice device, int priority) {
		if (DBG) {
		log("setPriority(" + device + ", " + priority + ")");
		}
		if (mService != null && isEnabled() &&
		isValidDevice(device)) {
		if (priority != BluetoothProfile.PRIORITY_OFF &&
		priority != BluetoothProfile.PRIORITY_ON) {
		return false;
		}
		try {
		return mService.setPriority(device, priority);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return false;
		}
		}
		if (mService == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return false;
		}

		/**
		* Get the priority of the profile.
		*
		* <p> The priority can be any of:
		* {@link #PRIORITY_AUTO_CONNECT}, {@link #PRIORITY_OFF},
		* {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* @param device Bluetooth device
		* @return priority of the device
		*/
		public int getPriority(BluetoothDevice device) {
		if (VDBG) {
		log("getPriority(" + device + ")");
		}
		if (mService != null && isEnabled() && isValidDevice(device)) {
		try {
		return mService.getPriority(device);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return PRIORITY_OFF;
		}
		}
		if (mService == null) {
		Log.w(TAG, "Proxy not attached to service");
		}
		return PRIORITY_OFF;
		}
		}

framework/java/android/bluetooth/BluetoothProfile.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,12 @@ public interface BluetoothProfile {
		*/
		public static final int HEADSET_CLIENT = 16;

		/**
		* PBAP Client
		* @hide
		*/
		public static final int PBAP_CLIENT = 17;

		/**
		* Default priority for devices that we try to auto-connect to and
		* and allow incoming connections for the profile