Revert "Fix bluetooth settings will broadcast to anywhere when some cases"
This reverts commit 9d00364da4
.
Reason for revert: This fix have a regression, for not blocking b/183344112 revert it.
Change-Id: Ic4366b51e07b43c8d64d2e145563d8a30cb0fc60
This commit is contained in:
@@ -16,8 +16,6 @@
|
|||||||
|
|
||||||
package com.android.settings.bluetooth;
|
package com.android.settings.bluetooth;
|
||||||
|
|
||||||
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
|
|
||||||
|
|
||||||
import android.bluetooth.BluetoothDevice;
|
import android.bluetooth.BluetoothDevice;
|
||||||
import android.content.BroadcastReceiver;
|
import android.content.BroadcastReceiver;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -25,7 +23,6 @@ import android.content.DialogInterface;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
@@ -33,14 +30,11 @@ import android.widget.TextView;
|
|||||||
|
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
import com.android.internal.annotations.VisibleForTesting;
|
|
||||||
import com.android.internal.app.AlertActivity;
|
import com.android.internal.app.AlertActivity;
|
||||||
import com.android.internal.app.AlertController;
|
import com.android.internal.app.AlertController;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.password.PasswordUtils;
|
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
|
|
||||||
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BluetoothPermissionActivity shows a dialog for accepting incoming
|
* BluetoothPermissionActivity shows a dialog for accepting incoming
|
||||||
@@ -57,13 +51,8 @@ public class BluetoothPermissionActivity extends AlertActivity implements
|
|||||||
private TextView messageView;
|
private TextView messageView;
|
||||||
private Button mOkButton;
|
private Button mOkButton;
|
||||||
private BluetoothDevice mDevice;
|
private BluetoothDevice mDevice;
|
||||||
|
private String mReturnPackage = null;
|
||||||
@VisibleForTesting
|
private String mReturnClass = null;
|
||||||
String mReturnPackage = null;
|
|
||||||
@VisibleForTesting
|
|
||||||
String mReturnClass = null;
|
|
||||||
@VisibleForTesting
|
|
||||||
String mCallingAppPackageName;
|
|
||||||
|
|
||||||
private int mRequestType = 0;
|
private int mRequestType = 0;
|
||||||
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
|
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
|
||||||
@@ -91,7 +80,6 @@ public class BluetoothPermissionActivity extends AlertActivity implements
|
|||||||
|
|
||||||
getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
|
getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
|
||||||
Intent i = getIntent();
|
Intent i = getIntent();
|
||||||
mCallingAppPackageName = PasswordUtils.getCallingAppPackageName(getActivityToken());
|
|
||||||
String action = i.getAction();
|
String action = i.getAction();
|
||||||
if (!action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
|
if (!action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
|
||||||
Log.e(TAG, "Error: this activity may be started only with intent "
|
Log.e(TAG, "Error: this activity may be started only with intent "
|
||||||
@@ -106,22 +94,6 @@ public class BluetoothPermissionActivity extends AlertActivity implements
|
|||||||
mRequestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
|
mRequestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
|
||||||
BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
|
BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
|
||||||
|
|
||||||
// Even if the user has already made the choice, Bluetooth still may not know that if
|
|
||||||
// the user preference data have not been migrated from Settings app's shared
|
|
||||||
// preferences to Bluetooth app's. In that case, Bluetooth app broadcasts an
|
|
||||||
// ACTION_CONNECTION_ACCESS_REQUEST intent to ask to Settings app.
|
|
||||||
//
|
|
||||||
// If that happens, 'checkUserChoice()' here will do migration because it finds or
|
|
||||||
// creates a 'CachedBluetoothDevice' object for the device.
|
|
||||||
//
|
|
||||||
// After migration is done, 'checkUserChoice()' replies to the request by sending an
|
|
||||||
// ACTION_CONNECTION_ACCESS_REPLY intent. And we don't need to start permission activity
|
|
||||||
// dialog or notification.
|
|
||||||
if (checkUserChoice()) {
|
|
||||||
finish();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(DEBUG) Log.i(TAG, "onCreate() Request type: " + mRequestType);
|
if(DEBUG) Log.i(TAG, "onCreate() Request type: " + mRequestType);
|
||||||
|
|
||||||
if (mRequestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
|
if (mRequestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
|
||||||
@@ -230,14 +202,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
|
|||||||
sendReplyIntentToReceiver(false, true);
|
sendReplyIntentToReceiver(false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
private void sendReplyIntentToReceiver(final boolean allowed, final boolean always) {
|
||||||
void sendReplyIntentToReceiver(final boolean allowed, final boolean always) {
|
|
||||||
if (!TextUtils.equals(mCallingAppPackageName, mReturnPackage)) {
|
|
||||||
Log.w(TAG, "sendReplyIntentToReceiver() return package name is not equivalent"
|
|
||||||
+ " to calling package name!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
|
Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
|
||||||
|
|
||||||
if (mReturnPackage != null && mReturnClass != null) {
|
if (mReturnPackage != null && mReturnClass != null) {
|
||||||
@@ -281,76 +246,4 @@ public class BluetoothPermissionActivity extends AlertActivity implements
|
|||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return true user had made a choice, this method replies to the request according
|
|
||||||
* to user's previous decision
|
|
||||||
* false user hadnot made any choice on this device
|
|
||||||
*/
|
|
||||||
private boolean checkUserChoice() {
|
|
||||||
boolean processed = false;
|
|
||||||
|
|
||||||
// ignore if it is something else than phonebook/message settings it wants us to remember
|
|
||||||
if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
|
|
||||||
&& mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS
|
|
||||||
&& mRequestType != BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
|
|
||||||
Log.d(TAG, "checkUserChoice(): Unknown RequestType " + mRequestType);
|
|
||||||
return processed;
|
|
||||||
}
|
|
||||||
|
|
||||||
final LocalBluetoothManager bluetoothManager = Utils.getLocalBtManager(this);
|
|
||||||
final CachedBluetoothDeviceManager cachedDeviceManager =
|
|
||||||
bluetoothManager.getCachedDeviceManager();
|
|
||||||
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
|
|
||||||
if (cachedDevice == null) {
|
|
||||||
cachedDevice = cachedDeviceManager.addDevice(mDevice);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
|
|
||||||
final int phonebookPermission = mDevice.getPhonebookAccessPermission();
|
|
||||||
|
|
||||||
if (phonebookPermission == BluetoothDevice.ACCESS_UNKNOWN) {
|
|
||||||
// Leave 'processed' as false.
|
|
||||||
} else if (phonebookPermission == BluetoothDevice.ACCESS_ALLOWED) {
|
|
||||||
sendReplyIntentToReceiver(true, true);
|
|
||||||
processed = true;
|
|
||||||
} else if (phonebookPermission == BluetoothDevice.ACCESS_REJECTED) {
|
|
||||||
sendReplyIntentToReceiver(false, true);
|
|
||||||
processed = true;
|
|
||||||
} else {
|
|
||||||
Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
|
|
||||||
}
|
|
||||||
} else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
|
|
||||||
final int messagePermission = mDevice.getMessageAccessPermission();
|
|
||||||
|
|
||||||
if (messagePermission == BluetoothDevice.ACCESS_UNKNOWN) {
|
|
||||||
// Leave 'processed' as false.
|
|
||||||
} else if (messagePermission == BluetoothDevice.ACCESS_ALLOWED) {
|
|
||||||
sendReplyIntentToReceiver(true, true);
|
|
||||||
processed = true;
|
|
||||||
} else if (messagePermission == BluetoothDevice.ACCESS_REJECTED) {
|
|
||||||
sendReplyIntentToReceiver(false, true);
|
|
||||||
processed = true;
|
|
||||||
} else {
|
|
||||||
Log.e(TAG, "Bad messagePermission: " + messagePermission);
|
|
||||||
}
|
|
||||||
} else if (mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
|
|
||||||
final int simPermission = mDevice.getSimAccessPermission();
|
|
||||||
|
|
||||||
if (simPermission == BluetoothDevice.ACCESS_UNKNOWN) {
|
|
||||||
// Leave 'processed' as false.
|
|
||||||
} else if (simPermission == BluetoothDevice.ACCESS_ALLOWED) {
|
|
||||||
sendReplyIntentToReceiver(true, true);
|
|
||||||
processed = true;
|
|
||||||
} else if (simPermission == BluetoothDevice.ACCESS_REJECTED) {
|
|
||||||
sendReplyIntentToReceiver(false, true);
|
|
||||||
processed = true;
|
|
||||||
} else {
|
|
||||||
Log.e(TAG, "Bad simPermission: " + simPermission);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Log.d(TAG, "checkUserChoice(): returning " + processed);
|
|
||||||
return processed;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -29,6 +29,9 @@ import android.os.UserManager;
|
|||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
|
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
|
||||||
|
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BluetoothPermissionRequest is a receiver to receive Bluetooth connection
|
* BluetoothPermissionRequest is a receiver to receive Bluetooth connection
|
||||||
@@ -80,6 +83,21 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
|
|||||||
if (DEBUG) Log.d(TAG, "onReceive request type: " + mRequestType + " return "
|
if (DEBUG) Log.d(TAG, "onReceive request type: " + mRequestType + " return "
|
||||||
+ mReturnPackage + "," + mReturnClass);
|
+ mReturnPackage + "," + mReturnClass);
|
||||||
|
|
||||||
|
// Even if the user has already made the choice, Bluetooth still may not know that if
|
||||||
|
// the user preference data have not been migrated from Settings app's shared
|
||||||
|
// preferences to Bluetooth app's. In that case, Bluetooth app broadcasts an
|
||||||
|
// ACTION_CONNECTION_ACCESS_REQUEST intent to ask to Settings app.
|
||||||
|
//
|
||||||
|
// If that happens, 'checkUserChoice()' here will do migration because it finds or
|
||||||
|
// creates a 'CachedBluetoothDevice' object for the device.
|
||||||
|
//
|
||||||
|
// After migration is done, 'checkUserChoice()' replies to the request by sending an
|
||||||
|
// ACTION_CONNECTION_ACCESS_REPLY intent. And we don't need to start permission activity
|
||||||
|
// dialog or notification.
|
||||||
|
if (checkUserChoice()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Intent connectionAccessIntent = new Intent(action);
|
Intent connectionAccessIntent = new Intent(action);
|
||||||
connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
|
connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
|
||||||
// We use the FLAG_ACTIVITY_MULTIPLE_TASK since we can have multiple concurrent access
|
// We use the FLAG_ACTIVITY_MULTIPLE_TASK since we can have multiple concurrent access
|
||||||
@@ -194,4 +212,92 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return true user had made a choice, this method replies to the request according
|
||||||
|
* to user's previous decision
|
||||||
|
* false user hadnot made any choice on this device
|
||||||
|
*/
|
||||||
|
private boolean checkUserChoice() {
|
||||||
|
boolean processed = false;
|
||||||
|
|
||||||
|
// ignore if it is something else than phonebook/message settings it wants us to remember
|
||||||
|
if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
|
||||||
|
&& mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS
|
||||||
|
&& mRequestType != BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
|
||||||
|
if (DEBUG) Log.d(TAG, "checkUserChoice(): Unknown RequestType " + mRequestType);
|
||||||
|
return processed;
|
||||||
|
}
|
||||||
|
|
||||||
|
LocalBluetoothManager bluetoothManager = Utils.getLocalBtManager(mContext);
|
||||||
|
CachedBluetoothDeviceManager cachedDeviceManager =
|
||||||
|
bluetoothManager.getCachedDeviceManager();
|
||||||
|
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
|
||||||
|
if (cachedDevice == null) {
|
||||||
|
cachedDevice = cachedDeviceManager.addDevice(mDevice);
|
||||||
|
}
|
||||||
|
|
||||||
|
String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
|
||||||
|
|
||||||
|
if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
|
||||||
|
int phonebookPermission = mDevice.getPhonebookAccessPermission();
|
||||||
|
|
||||||
|
if (phonebookPermission == BluetoothDevice.ACCESS_UNKNOWN) {
|
||||||
|
// Leave 'processed' as false.
|
||||||
|
} else if (phonebookPermission == BluetoothDevice.ACCESS_ALLOWED) {
|
||||||
|
sendReplyIntentToReceiver(true);
|
||||||
|
processed = true;
|
||||||
|
} else if (phonebookPermission == BluetoothDevice.ACCESS_REJECTED) {
|
||||||
|
sendReplyIntentToReceiver(false);
|
||||||
|
processed = true;
|
||||||
|
} else {
|
||||||
|
Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
|
||||||
|
}
|
||||||
|
} else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
|
||||||
|
int messagePermission = mDevice.getMessageAccessPermission();
|
||||||
|
|
||||||
|
if (messagePermission == BluetoothDevice.ACCESS_UNKNOWN) {
|
||||||
|
// Leave 'processed' as false.
|
||||||
|
} else if (messagePermission == BluetoothDevice.ACCESS_ALLOWED) {
|
||||||
|
sendReplyIntentToReceiver(true);
|
||||||
|
processed = true;
|
||||||
|
} else if (messagePermission == BluetoothDevice.ACCESS_REJECTED) {
|
||||||
|
sendReplyIntentToReceiver(false);
|
||||||
|
processed = true;
|
||||||
|
} else {
|
||||||
|
Log.e(TAG, "Bad messagePermission: " + messagePermission);
|
||||||
|
}
|
||||||
|
} else if(mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
|
||||||
|
int simPermission = mDevice.getSimAccessPermission();
|
||||||
|
|
||||||
|
if (simPermission == BluetoothDevice.ACCESS_UNKNOWN) {
|
||||||
|
// Leave 'processed' as false.
|
||||||
|
} else if (simPermission == BluetoothDevice.ACCESS_ALLOWED) {
|
||||||
|
sendReplyIntentToReceiver(true);
|
||||||
|
processed = true;
|
||||||
|
} else if (simPermission == BluetoothDevice.ACCESS_REJECTED) {
|
||||||
|
sendReplyIntentToReceiver(false);
|
||||||
|
processed = true;
|
||||||
|
} else {
|
||||||
|
Log.e(TAG, "Bad simPermission: " + simPermission);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (DEBUG) Log.d(TAG,"checkUserChoice(): returning " + processed);
|
||||||
|
return processed;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void sendReplyIntentToReceiver(final boolean allowed) {
|
||||||
|
Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
|
||||||
|
|
||||||
|
if (mReturnPackage != null && mReturnClass != null) {
|
||||||
|
intent.setClassName(mReturnPackage, mReturnClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
intent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
|
||||||
|
allowed ? BluetoothDevice.CONNECTION_ACCESS_YES
|
||||||
|
: BluetoothDevice.CONNECTION_ACCESS_NO);
|
||||||
|
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
|
||||||
|
intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
|
||||||
|
mContext.sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -27,15 +27,12 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuInflater;
|
import android.view.MenuInflater;
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.password.PasswordUtils;
|
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
import com.android.settingslib.core.AbstractPreferenceController;
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
|
|
||||||
@@ -51,16 +48,10 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
|
|||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
BluetoothProgressCategory mAvailableDevicesCategory;
|
BluetoothProgressCategory mAvailableDevicesCategory;
|
||||||
@VisibleForTesting
|
|
||||||
String mLaunchPackage;
|
|
||||||
@VisibleForTesting
|
|
||||||
String mLaunchClass;
|
|
||||||
@VisibleForTesting
|
|
||||||
String mCallingAppPackageName;
|
|
||||||
@VisibleForTesting
|
|
||||||
Context mContext;
|
|
||||||
|
|
||||||
private boolean mNeedAuth;
|
private boolean mNeedAuth;
|
||||||
|
private String mLaunchPackage;
|
||||||
|
private String mLaunchClass;
|
||||||
private boolean mScanAllowed;
|
private boolean mScanAllowed;
|
||||||
|
|
||||||
public DevicePickerFragment() {
|
public DevicePickerFragment() {
|
||||||
@@ -94,9 +85,6 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
|
|||||||
getActivity().setTitle(getString(R.string.device_picker));
|
getActivity().setTitle(getString(R.string.device_picker));
|
||||||
UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
|
UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
|
||||||
mScanAllowed = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH);
|
mScanAllowed = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH);
|
||||||
mCallingAppPackageName = PasswordUtils.getCallingAppPackageName(
|
|
||||||
getActivity().getActivityToken());
|
|
||||||
mContext = getContext();
|
|
||||||
setHasOptionsMenu(true);
|
setHasOptionsMenu(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -200,17 +188,11 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void sendDevicePickedIntent(BluetoothDevice device) {
|
private void sendDevicePickedIntent(BluetoothDevice device) {
|
||||||
if (!TextUtils.equals(mCallingAppPackageName, mLaunchPackage)) {
|
|
||||||
Log.w(TAG, "sendDevicePickedIntent() launch package name is not equivalent to"
|
|
||||||
+ " calling package name!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Intent intent = new Intent(BluetoothDevicePicker.ACTION_DEVICE_SELECTED);
|
Intent intent = new Intent(BluetoothDevicePicker.ACTION_DEVICE_SELECTED);
|
||||||
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
|
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
|
||||||
if (mLaunchPackage != null && mLaunchClass != null) {
|
if (mLaunchPackage != null && mLaunchClass != null) {
|
||||||
intent.setClassName(mLaunchPackage, mLaunchClass);
|
intent.setClassName(mLaunchPackage, mLaunchClass);
|
||||||
}
|
}
|
||||||
mContext.sendBroadcast(intent, Manifest.permission.BLUETOOTH_ADMIN);
|
getActivity().sendBroadcast(intent, Manifest.permission.BLUETOOTH_ADMIN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,80 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2021 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 com.google.common.truth.Truth.assertThat;
|
|
||||||
|
|
||||||
import static org.mockito.ArgumentMatchers.eq;
|
|
||||||
import static org.mockito.Mockito.never;
|
|
||||||
import static org.mockito.Mockito.spy;
|
|
||||||
import static org.mockito.Mockito.verify;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.mockito.ArgumentCaptor;
|
|
||||||
import org.mockito.MockitoAnnotations;
|
|
||||||
import org.robolectric.RobolectricTestRunner;
|
|
||||||
import org.robolectric.RuntimeEnvironment;
|
|
||||||
import org.robolectric.util.ReflectionHelpers;
|
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
|
||||||
public class BluetoothPermissionActivityTest {
|
|
||||||
|
|
||||||
private BluetoothPermissionActivity mActivity;
|
|
||||||
private Context mContext;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setUp() {
|
|
||||||
MockitoAnnotations.initMocks(this);
|
|
||||||
mContext = spy(RuntimeEnvironment.application);
|
|
||||||
mActivity = new BluetoothPermissionActivity();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void callingPackageIsEqualToReturnPackage_sendBroadcastToReturnPackage() {
|
|
||||||
mActivity.mReturnPackage = "com.android.settings";
|
|
||||||
mActivity.mReturnClass = "com.android.settings.bluetooth.BluetoothPermissionActivity";
|
|
||||||
mActivity.mCallingAppPackageName = "com.android.settings";
|
|
||||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
|
||||||
ReflectionHelpers.setField(mActivity, "mBase", mContext);
|
|
||||||
|
|
||||||
mActivity.sendReplyIntentToReceiver(true, true);
|
|
||||||
|
|
||||||
verify(mContext).sendBroadcast(intentCaptor.capture(),
|
|
||||||
eq("android.permission.BLUETOOTH_ADMIN"));
|
|
||||||
assertThat(intentCaptor.getValue().getComponent().getPackageName())
|
|
||||||
.isEqualTo("com.android.settings");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void callingPackageIsNotEqualToReturnPackage_broadcastNotSend() {
|
|
||||||
mActivity.mReturnPackage = "com.fake.settings";
|
|
||||||
mActivity.mReturnClass = "com.android.settings.bluetooth.BluetoothPermissionActivity";
|
|
||||||
mActivity.mCallingAppPackageName = "com.android.settings";
|
|
||||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
|
||||||
ReflectionHelpers.setField(mActivity, "mBase", mContext);
|
|
||||||
|
|
||||||
mActivity.sendReplyIntentToReceiver(true, true);
|
|
||||||
|
|
||||||
verify(mContext, never()).sendBroadcast(intentCaptor.capture(),
|
|
||||||
eq("android.permission.BLUETOOTH_ADMIN"));
|
|
||||||
}
|
|
||||||
}
|
|
@@ -16,46 +16,28 @@
|
|||||||
|
|
||||||
package com.android.settings.bluetooth;
|
package com.android.settings.bluetooth;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
|
||||||
|
|
||||||
import static org.mockito.ArgumentMatchers.eq;
|
|
||||||
import static org.mockito.Mockito.mock;
|
|
||||||
import static org.mockito.Mockito.never;
|
|
||||||
import static org.mockito.Mockito.spy;
|
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
import android.bluetooth.BluetoothDevice;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
|
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.ArgumentCaptor;
|
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.MockitoAnnotations;
|
import org.mockito.MockitoAnnotations;
|
||||||
import org.robolectric.RobolectricTestRunner;
|
import org.robolectric.RobolectricTestRunner;
|
||||||
import org.robolectric.RuntimeEnvironment;
|
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
public class DevicePickerFragmentTest {
|
public class DevicePickerFragmentTest {
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private BluetoothProgressCategory mAvailableDevicesCategory;
|
private BluetoothProgressCategory mAvailableDevicesCategory;
|
||||||
|
|
||||||
private DevicePickerFragment mFragment;
|
private DevicePickerFragment mFragment;
|
||||||
private Context mContext;
|
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
|
|
||||||
mFragment = new DevicePickerFragment();
|
mFragment = new DevicePickerFragment();
|
||||||
mContext = spy(RuntimeEnvironment.application);
|
|
||||||
mFragment.mContext = mContext;
|
|
||||||
mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
|
mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,40 +49,4 @@ public class DevicePickerFragmentTest {
|
|||||||
|
|
||||||
verify(mAvailableDevicesCategory).setProgress(true);
|
verify(mAvailableDevicesCategory).setProgress(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void callingPackageIsEqualToLaunchPackage_sendBroadcastToLaunchPackage() {
|
|
||||||
final CachedBluetoothDevice cachedDevice = mock(CachedBluetoothDevice.class);
|
|
||||||
final BluetoothDevice bluetoothDevice = mock(BluetoothDevice.class);
|
|
||||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
|
||||||
when(cachedDevice.getDevice()).thenReturn(bluetoothDevice);
|
|
||||||
mFragment.mSelectedDevice = bluetoothDevice;
|
|
||||||
mFragment.mLaunchPackage = "com.android.settings";
|
|
||||||
mFragment.mLaunchClass = "com.android.settings.bluetooth.BluetoothPermissionActivity";
|
|
||||||
mFragment.mCallingAppPackageName = "com.android.settings";
|
|
||||||
|
|
||||||
mFragment.onDeviceBondStateChanged(cachedDevice, BluetoothDevice.BOND_BONDED);
|
|
||||||
|
|
||||||
verify(mContext).sendBroadcast(intentCaptor.capture(),
|
|
||||||
eq("android.permission.BLUETOOTH_ADMIN"));
|
|
||||||
assertThat(intentCaptor.getValue().getComponent().getPackageName())
|
|
||||||
.isEqualTo(mFragment.mLaunchPackage);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void callingPackageIsNotEqualToLaunchPackage_broadcastNotSend() {
|
|
||||||
final CachedBluetoothDevice cachedDevice = mock(CachedBluetoothDevice.class);
|
|
||||||
final BluetoothDevice bluetoothDevice = mock(BluetoothDevice.class);
|
|
||||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
|
||||||
when(cachedDevice.getDevice()).thenReturn(bluetoothDevice);
|
|
||||||
mFragment.mSelectedDevice = bluetoothDevice;
|
|
||||||
mFragment.mLaunchPackage = "com.fake.settings";
|
|
||||||
mFragment.mLaunchClass = "com.android.settings.bluetooth.BluetoothPermissionActivity";
|
|
||||||
mFragment.mCallingAppPackageName = "com.android.settings";
|
|
||||||
|
|
||||||
mFragment.onDeviceBondStateChanged(cachedDevice, BluetoothDevice.BOND_BONDED);
|
|
||||||
|
|
||||||
verify(mContext, never()).sendBroadcast(intentCaptor.capture(),
|
|
||||||
eq("android.permission.BLUETOOTH_ADMIN"));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user