diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-09-10 23:21:24 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-09-10 23:21:24 +0000 |
commit | c645a99a8b2ff982503dace69b226145d0bcc4b6 (patch) | |
tree | 2951fbb729b7b1a09d2742d802de89d63e7d801b | |
parent | e0908da4594168d0b6a1b487271119e3e2dc301b (diff) | |
parent | 0f52a07037e3795b9173af1397086afa3c2e1913 (diff) | |
download | Settings-pie-qpr1-release.tar.gz |
Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-releaseandroid-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-release
Change-Id: I9ffc062718d9e2cd9b06ef489f9a05b44339e500
-rw-r--r-- | src/com/android/settings/bluetooth/BluetoothPairingController.java | 22 | ||||
-rw-r--r-- | tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java | 66 |
2 files changed, 80 insertions, 8 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java index 5120cc0ff9b..4b9ffdad4eb 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java @@ -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 (mPbapAllowed) { + mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED); + } else { + mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED); + } + if (getDialogType() == USER_ENTRY_DIALOG) { - if (mPbapAllowed) { - mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED); - } else { - mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED); - } onPair(mUserInput); } else { onPair(null); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java new file mode 100644 index 00000000000..b28a8b2b825 --- /dev/null +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java @@ -0,0 +1,66 @@ +/* + * 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); + } +} |