Snap for 4471243 from 84ca92e27458ec99b88204b0952561bf72d746a2 to pi-release (f1f387ad) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -423,6 +423,14 @@ class AvrcpControllerStateMachine extends StateMachine {
		mAddressedPlayer.updateCurrentTrack((TrackInfo) msg.obj);
		broadcastMetaDataChanged(
		mAddressedPlayer.getCurrentTrack().getMediaMetaData());

		//update playerList
		byte start = (byte) 0b00000000;
		byte end = (byte) 0b11111111;
		AvrcpControllerService.getPlayerListNative(
		mRemoteDevice.getBluetoothAddress(), start, end);
		transitionTo(mGetPlayerListing);
		sendMessageDelayed(MESSAGE_INTERNAL_CMD_TIMEOUT, CMD_TIMEOUT_MILLIS);
		break;

		case MESSAGE_PROCESS_PLAY_POS_CHANGED:

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -3626,9 +3626,11 @@ public class BluetoothMapContentObserver {
		mSmsBroadcastReceiver.unregister();
		}
		unRegisterPhoneServiceStateListener();
		if (UserManager.get(mContext).isUserUnlocked()) {
		failPendingMessages();
		removeDeletedMessages();
		}
		}

		public boolean handleSmsSendIntent(Context context, Intent intent) {
		TYPE type = TYPE.fromOrdinal(

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpStateMachineTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.bluetooth.btservice.AdapterService;
		import org.junit.After;
		import org.junit.Assert;
		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		@@ -42,6 +43,7 @@ import org.mockito.MockitoAnnotations;

		import java.lang.reflect.Method;

		@Ignore("Flaky tests. Ignore until the following CL is merged: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/540316")
		@MediumTest
		@RunWith(AndroidJUnit4.class)
		public class A2dpStateMachineTest {

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

0 → 100644

+219 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 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 com.android.bluetooth.btservice;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.Matchers.anyInt;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.timeout;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.app.AlarmManager;
		import android.bluetooth.BluetoothAdapter;
		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.res.Resources;
		import android.os.Looper;
		import android.os.PowerManager;
		import android.os.Process;
		import android.os.UserManager;
		import android.support.test.InstrumentationRegistry;
		import android.support.test.filters.MediumTest;
		import android.support.test.runner.AndroidJUnit4;
		import android.test.mock.MockContentResolver;

		import com.android.bluetooth.R;
		import com.android.bluetooth.gatt.GattService;
		import com.android.bluetooth.pan.PanService;
		import com.android.bluetooth.pbap.BluetoothPbapService;

		import org.junit.After;
		import org.junit.Assert;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		@MediumTest
		@RunWith(AndroidJUnit4.class)
		public class AdapterServiceTest {

		private void milliSleep(int millis) {
		try {
		Thread.sleep(millis);
		} catch (Exception e) {
		//Ignore the exception
		}
		}

		private AdapterService mAdapterService;

		private @Mock Context mMockContext;
		private @Mock ApplicationInfo mMockApplicationInfo;
		private @Mock AlarmManager mMockAlarmManager;
		private @Mock Resources mMockResources;
		private @Mock UserManager mMockUserManager;

		private static final int CONTEXT_SWITCH_MS = 100;
		private static final int ONE_SECOND_MS = 1000;
		private static final int NATIVE_INIT_MS = 8000;

		@Before
		public void setUp() {
		if (Looper.myLooper() == null) {
		Looper.prepare();
		}
		Assert.assertNotNull(Looper.myLooper());

		InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
		@Override
		public void run() {
		mAdapterService = new AdapterService();
		}
		});
		PackageManager mMockPackageManager = mock(PackageManager.class);
		MockContentResolver mMockContentResolver = new MockContentResolver(mMockContext);
		MockitoAnnotations.initMocks(this);
		PowerManager mPowerManager = (PowerManager) InstrumentationRegistry.getContext()
		.getSystemService(Context.POWER_SERVICE);

		when(mMockContext.getApplicationInfo()).thenReturn(mMockApplicationInfo);
		when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);
		when(mMockContext.getApplicationContext()).thenReturn(mMockContext);
		when(mMockContext.getResources()).thenReturn(mMockResources);
		when(mMockContext.getUserId()).thenReturn(Process.BLUETOOTH_UID);
		when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager);
		when(mMockContext.getSystemService(Context.USER_SERVICE)).thenReturn(mMockUserManager);
		when(mMockContext.getSystemService(Context.POWER_SERVICE)).thenReturn(mPowerManager);
		when(mMockContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mMockAlarmManager);

		when(mMockResources.getBoolean(R.bool.profile_supported_gatt)).thenReturn(true);
		when(mMockResources.getBoolean(R.bool.profile_supported_pbap)).thenReturn(true);
		when(mMockResources.getBoolean(R.bool.profile_supported_pan)).thenReturn(true);

		try {
		doReturn(Process.BLUETOOTH_UID).when(mMockPackageManager).getPackageUidAsUser(any(),
		anyInt(), anyInt());
		} catch (Exception e) {
		//Ignore the exception
		}
		// Attach a context to the service for permission checks.
		mAdapterService.attach(mMockContext, null, null, null, null, null);

		mAdapterService.onCreate();

		Config.init(mMockContext);
		}

		@After
		public void tearDown() {
		mAdapterService.finalize();
		}

		/**
		* Test: Turn Bluetooth on.
		* Check whether the AdapterService gets started.
		*/
		@Test
		public void testEnable() {
		Assert.assertFalse(mAdapterService.isEnabled());

		mAdapterService.enable();

		// Start GATT
		verify(mMockContext, timeout(CONTEXT_SWITCH_MS).times(1)).startService(any());
		milliSleep(CONTEXT_SWITCH_MS);
		mAdapterService.onProfileServiceStateChanged(GattService.class.getName(),
		BluetoothAdapter.STATE_ON);

		// Wait for the native initialization (remove when refactored)
		milliSleep(NATIVE_INIT_MS);

		mAdapterService.onLeServiceUp();
		milliSleep(ONE_SECOND_MS);

		// Start PBAP and PAN
		verify(mMockContext, timeout(ONE_SECOND_MS).times(3)).startService(any());
		mAdapterService.onProfileServiceStateChanged(PanService.class.getName(),
		BluetoothAdapter.STATE_ON);
		mAdapterService.onProfileServiceStateChanged(BluetoothPbapService.class.getName(),
		BluetoothAdapter.STATE_ON);

		milliSleep(CONTEXT_SWITCH_MS);

		Assert.assertTrue(mAdapterService.isEnabled());
		}

		/**
		* Test: Turn Bluetooth on/off.
		* Check whether the AdapterService gets started and stopped.
		*/
		@Test
		public void testEnableDisable() {
		Assert.assertFalse(mAdapterService.isEnabled());

		mAdapterService.enable();

		// Start GATT
		verify(mMockContext, timeout(CONTEXT_SWITCH_MS).times(1)).startService(any());
		milliSleep(CONTEXT_SWITCH_MS);
		mAdapterService.onProfileServiceStateChanged(GattService.class.getName(),
		BluetoothAdapter.STATE_ON);

		// Wait for the native initialization (remove when refactored)
		milliSleep(NATIVE_INIT_MS);

		mAdapterService.onLeServiceUp();
		milliSleep(ONE_SECOND_MS);

		// Start PBAP and PAN
		verify(mMockContext, timeout(ONE_SECOND_MS).times(3)).startService(any());
		mAdapterService.onProfileServiceStateChanged(PanService.class.getName(),
		BluetoothAdapter.STATE_ON);
		mAdapterService.onProfileServiceStateChanged(BluetoothPbapService.class.getName(),
		BluetoothAdapter.STATE_ON);

		milliSleep(CONTEXT_SWITCH_MS);

		Assert.assertTrue(mAdapterService.isEnabled());

		mAdapterService.disable();

		// Stop PBAP and PAN
		verify(mMockContext, timeout(ONE_SECOND_MS).times(5)).startService(any());
		mAdapterService.onProfileServiceStateChanged(PanService.class.getName(),
		BluetoothAdapter.STATE_OFF);
		mAdapterService.onProfileServiceStateChanged(BluetoothPbapService.class.getName(),
		BluetoothAdapter.STATE_OFF);

		milliSleep(ONE_SECOND_MS);

		mAdapterService.onBrEdrDown();
		milliSleep(ONE_SECOND_MS);

		// Stop GATT
		verify(mMockContext, timeout(ONE_SECOND_MS).times(6)).startService(any());
		mAdapterService.onProfileServiceStateChanged(GattService.class.getName(),
		BluetoothAdapter.STATE_OFF);

		Assert.assertFalse(mAdapterService.isEnabled());
		}
		}