Commit 9768d4f3 authored Nov 23, 2020 by Michael Sun Committed by Automerger Merge Worker Nov 23, 2020

Merge "btaa: do not initialize btaa JNI interface until gd migration is done"...

Merge "btaa: do not initialize btaa JNI interface until gd migration is done" am: e86a0589 am: 69e97b47

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1507628

Change-Id: Ifd0109b2e991e3f25f3fe9fcc45fc80ad2ff6521

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -468,7 +468,6 @@ public class AdapterService extends Service {
		ServiceManager.getService(BatteryStats.SERVICE_NAME));

		mBluetoothKeystoreService.initJni();
		mActivityAttributionService.initJni();

		mSdpManager = SdpManager.init(this);
		registerReceiver(mAlarmBroadcastReceiver, new IntentFilter(ACTION_ALARM_WAKEUP));