Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev (205479c2) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothPairingController.java

+14 −8

Original line number	Diff line number	Diff line
		@@ -23,12 +23,16 @@ import android.text.Editable;
		import android.util.Log;
		import android.widget.CompoundButton;
		import android.widget.CompoundButton.OnCheckedChangeListener;

		import com.android.settings.R;
		import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.settingslib.bluetooth.LocalBluetoothProfile;

		import java.util.Locale;

		import android.support.annotation.VisibleForTesting;

		/**
		* A controller used by {@link BluetoothPairingDialog} to manage connection state while we try to
		* pair with a bluetooth device. It includes methods that allow the
		@@ -50,8 +54,10 @@ public class BluetoothPairingController implements OnCheckedChangeListener,

		// Bluetooth dependencies for the connection we are trying to establish
		private LocalBluetoothManager mBluetoothManager;
		private BluetoothDevice mDevice;
		private int mType;
		@VisibleForTesting
		BluetoothDevice mDevice;
		@VisibleForTesting
		int mType;
		private String mUserInput;
		private String mPasskeyFormatted;
		private int mPasskey;
		@@ -82,7 +88,6 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
		mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
		mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
		mPasskeyFormatted = formatKey(mPasskey);

		}

		@Override
		@@ -96,12 +101,13 @@ public class BluetoothPairingController implements OnCheckedChangeListener,

		@Override
		public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) {
		if (getDialogType() == USER_ENTRY_DIALOG) {
		if (mPbapAllowed) {
		mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
		} else {
		mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
		}

		if (getDialogType() == USER_ENTRY_DIALOG) {
		onPair(mUserInput);
		} else {
		onPair(null);

tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.settings.bluetooth;

		import static android.bluetooth.BluetoothDevice.PAIRING_VARIANT_CONSENT;

		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.verify;

		import android.bluetooth.BluetoothDevice;
		import android.content.Context;
		import android.content.Intent;

		import com.android.settings.testutils.SettingsRobolectricTestRunner;
		import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
		import com.android.settings.testutils.shadow.ShadowBluetoothPan;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class})
		public class BluetoothPairingControllerTest {
		@Mock
		private BluetoothDevice mBluetoothDevice;
		private Context mContext;
		private BluetoothPairingController mBluetoothPairingController;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);

		mContext = RuntimeEnvironment.application;
		final Intent intent = new Intent();
		intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
		mBluetoothPairingController = spy(new BluetoothPairingController(intent, mContext));
		}

		@Test
		public void onDialogPositiveClick_confirmationDialog_setPBAP() {
		mBluetoothPairingController.mType = PAIRING_VARIANT_CONSENT;
		mBluetoothPairingController.onCheckedChanged(null, true);

		mBluetoothPairingController.onDialogPositiveClick(null);

		verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
		}
		}