Merge "[Manual] Rename methods and classes" am: ff9fff7b3b am: 0e119d05df am: 0229f8cdd8 (7cfd3811) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_gatt.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ static jmethodID method_onBatchScanStartStopped;
		static jmethodID method_onBatchScanReports;
		static jmethodID method_onBatchScanThresholdCrossed;

		static jmethodID method_CreateonTrackAdvFoundLostObject;
		static jmethodID method_createOnTrackAdvFoundLostObject;
		static jmethodID method_onTrackAdvFoundLost;
		static jmethodID method_onScanParamSetupCompleted;
		static jmethodID method_getSampleGattDbElement;
		@@ -415,7 +415,7 @@ void btgattc_track_adv_event_cb(btgatt_track_adv_info_t* p_adv_track_info) {
		ScopedLocalRef<jobject> trackadv_obj(
		sCallbackEnv.get(),
		sCallbackEnv->CallObjectMethod(
		mCallbacksObj, method_CreateonTrackAdvFoundLostObject,
		mCallbacksObj, method_createOnTrackAdvFoundLostObject,
		p_adv_track_info->client_if, p_adv_track_info->adv_pkt_len,
		jb_adv_pkt.get(), p_adv_track_info->scan_rsp_len, jb_scan_rsp.get(),
		p_adv_track_info->filt_index, p_adv_track_info->advertiser_state,
		@@ -815,8 +815,8 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
		env->GetMethodID(clazz, "onBatchScanReports", "(IIII[B)V");
		method_onBatchScanThresholdCrossed =
		env->GetMethodID(clazz, "onBatchScanThresholdCrossed", "(I)V");
		method_CreateonTrackAdvFoundLostObject =
		env->GetMethodID(clazz, "CreateonTrackAdvFoundLostObject",
		method_createOnTrackAdvFoundLostObject =
		env->GetMethodID(clazz, "createOnTrackAdvFoundLostObject",
		"(II[BI[BIIILjava/lang/String;IIII)Lcom/android/"
		"bluetooth/gatt/AdvtFilterOnFoundOnLostInfo;");
		method_onTrackAdvFoundLost = env->GetMethodID(
		@@ -825,7 +825,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
		method_onScanParamSetupCompleted =
		env->GetMethodID(clazz, "onScanParamSetupCompleted", "(II)V");
		method_getSampleGattDbElement =
		env->GetMethodID(clazz, "GetSampleGattDbElement",
		env->GetMethodID(clazz, "getSampleGattDbElement",
		"()Lcom/android/bluetooth/gatt/GattDbElement;");
		method_onGetGattDb =
		env->GetMethodID(clazz, "onGetGattDb", "(ILjava/util/ArrayList;)V");

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -843,8 +843,8 @@ public class A2dpSinkStateMachine extends StateMachine {
		}
		}

		public boolean SendPassThruPlay(BluetoothDevice mDevice) {
		log("SendPassThruPlay + ");
		public boolean sendPassThruPlay(BluetoothDevice mDevice) {
		log("sendPassThruPlay + ");
		AvrcpControllerService avrcpCtrlService = AvrcpControllerService.getAvrcpControllerService();
		if ((avrcpCtrlService != null) && (mDevice != null) &&
		(avrcpCtrlService.getConnectedDevices().contains(mDevice))){
		@@ -854,7 +854,7 @@ public class A2dpSinkStateMachine extends StateMachine {
		avrcpCtrlService.sendPassThroughCmd(mDevice,
		AvrcpControllerService.PASS_THRU_CMD_ID_PLAY,
		AvrcpControllerService.KEY_STATE_RELEASED);
		log(" SendPassThruPlay command sent - ");
		log(" sendPassThruPlay command sent - ");
		return true;
		} else {
		log("passthru command not sent, connection unavailable");

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -463,8 +463,8 @@ public class AdapterService extends Service {
		}
		}

		void BleOnProcessStart() {
		debugLog("BleOnProcessStart()");
		void bleOnProcessStart() {
		debugLog("bleOnProcessStart()");

		if (getResources().getBoolean(
		R.bool.config_bluetooth_reload_supported_profiles_when_enabled)) {
		@@ -489,7 +489,7 @@ public class AdapterService extends Service {
		mRemoteDevices.reset();
		mAdapterProperties.init(mRemoteDevices);

		debugLog("BleOnProcessStart() - Make Bond State Machine");
		debugLog("bleOnProcessStart() - Make Bond State Machine");
		mBondStateMachine = BondStateMachine.make(this, mAdapterProperties, mRemoteDevices);

		mJniCallbacks.init(mBondStateMachine,mRemoteDevices);

android/app/src/com/android/bluetooth/btservice/AdapterState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ final class AdapterState extends StateMachine {
		mPendingCommandState.setBleTurningOn(true);
		transitionTo(mPendingCommandState);
		sendMessageDelayed(BLE_START_TIMEOUT, BLE_START_TIMEOUT_DELAY);
		adapterService.BleOnProcessStart();
		adapterService.bleOnProcessStart();
		break;

		case USER_TURN_OFF:

android/app/src/com/android/bluetooth/gatt/GattService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1073,7 +1073,7 @@ public class GattService extends ProfileService {
		t.start();
		}

		GattDbElement GetSampleGattDbElement() {
		GattDbElement getSampleGattDbElement() {
		return new GattDbElement();
		}

		@@ -1453,7 +1453,7 @@ public class GattService extends ProfileService {
		flushPendingBatchResults(clientIf);
		}

		AdvtFilterOnFoundOnLostInfo CreateonTrackAdvFoundLostObject(int clientIf, int advPktLen,
		AdvtFilterOnFoundOnLostInfo createOnTrackAdvFoundLostObject(int clientIf, int advPktLen,
		byte[] advPkt, int scanRspLen, byte[] scanRsp, int filtIndex, int advState,
		int advInfoPresent, String address, int addrType, int txPower, int rssiValue,
		int timeStamp) {