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

Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382 am: c0118ac10e

Browse Source 
am: 3db1ff462a

Change-Id: I846e7d5b84fb953f93256c8c6d2ca18d37199f1f
This commit is contained in:
ltrochtova
2017-01-26 09:58:53 +00:00
committed by android-build-merger
parent 4ad5263a52 3db1ff462a
commit a0f229263a
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ import android.os.Message;
import android.os.Process;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.UserHandle;
import android.os.UserManager;
@@ -59,6 +60,8 @@ import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
import android.util.Slog;
import com.android.server.pm.PackageManagerService;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.concurrent.ConcurrentHashMap;
@@ -218,6 +221,11 @@ 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) {
@@ -228,6 +236,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
// when from system.
}
}
updateOppLauncherComponentState(bluetoothDisallowed);
}
};
@@ -954,7 +963,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
UserManagerInternal userManagerInternal =
LocalServices.getService(UserManagerInternal.class);
userManagerInternal.addUserRestrictionsListener(mUserRestrictionsListener);
if (isBluetoothDisallowed()) {
final boolean isBluetoothDisallowed = isBluetoothDisallowed();
PackageManagerService packageManagerService =
(PackageManagerService) ServiceManager.getService("package");
if (packageManagerService != null && !packageManagerService.isOnlyCoreApps()) {
updateOppLauncherComponentState(isBluetoothDisallowed);
}
if (isBluetoothDisallowed) {
return;
}
if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) {
@@ -2011,6 +2026,28 @@ 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;
try {
mContext.getPackageManager()
.setComponentEnabledSetting(oppLauncherComponent, newState, 0);
} catch (Exception e) {
// The component was not found, do nothing.
}
}
@Override
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);