Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e

Browse Source 
am: 2d0ad3a9e7

Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01
This commit is contained in:
Andre Eisenbach
2017-01-12 16:44:42 +00:00
committed by android-build-merger
parent 6dacea63d9 2d0ad3a9e7
commit e81838f7e1
1 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -218,11 +218,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
@Override
public void onUserRestrictionsChanged(int userId, Bundle newRestrictions,
Bundle prevRestrictions) {
if (!newRestrictions.containsKey(UserManager.DISALLOW_BLUETOOTH)
&& !prevRestrictions.containsKey(UserManager.DISALLOW_BLUETOOTH)) {
// The relevant restriction has not changed - do nothing.
return;
}
final boolean bluetoothDisallowed =
newRestrictions.getBoolean(UserManager.DISALLOW_BLUETOOTH);
if ((mEnable || mEnableExternal) && bluetoothDisallowed) {
@@ -233,7 +228,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
// when from system.
}
}
updateOppLauncherComponentState(bluetoothDisallowed);
}
};
@@ -955,9 +949,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
UserManagerInternal userManagerInternal =
LocalServices.getService(UserManagerInternal.class);
userManagerInternal.addUserRestrictionsListener(mUserRestrictionsListener);
final boolean isBluetoothDisallowed = isBluetoothDisallowed();
updateOppLauncherComponentState(isBluetoothDisallowed);
if (isBluetoothDisallowed) {
if (isBluetoothDisallowed()) {
return;
}
if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) {
@@ -2014,24 +2006,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
}
}
/**
* Disables BluetoothOppLauncherActivity component, so the Bluetooth sharing option is not
* offered to the user if Bluetooth is disallowed. Puts the component to its default state if
* Bluetooth is not disallowed.
*
* @param bluetoothDisallowed whether the {@link UserManager.DISALLOW_BLUETOOTH} user
* restriction was set.
*/
private void updateOppLauncherComponentState(boolean bluetoothDisallowed) {
final ComponentName oppLauncherComponent = new ComponentName("com.android.bluetooth",
"com.android.bluetooth.opp.BluetoothOppLauncherActivity");
final int newState = bluetoothDisallowed
? PackageManager.COMPONENT_ENABLED_STATE_DISABLED
: PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
mContext.getPackageManager()
.setComponentEnabledSetting(oppLauncherComponent, newState, 0);
}
@Override
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);