Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e992dbc authored by Lenka Trochtova's avatar Lenka Trochtova Committed by Andre Eisenbach
Browse files

Don't offer the BT sharing option to the user if BT is disallowed. 

Disable BluetoothOppLauncherActivity component if the
UserManager#BLUETOOTH_DISALLOWED user restriction is set.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895060
Bug: 34239380

Change-Id: I3467c82881896f276f542583bb50807b5e27276b
parent d72120d2

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+38 −1
Original line number Diff line number Diff line
@@ -49,6 +49,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;
@@ -58,6 +59,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;
@@ -217,6 +220,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) {
@@ -227,6 +235,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                  // when from system.

                }

            }

            updateOppLauncherComponentState(bluetoothDisallowed);

        }

    };
@@ -938,7 +947,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()) {
@@ -1995,6 +2010,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);