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

Commit 7d67c73a authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge "Revert "Don't offer the BT sharing option to the user if BT is... 

Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: e5eb8ca4 am: e5ee57b6 am: ad042317
am: 2e50bb1a

Change-Id: I8144d1e2c856304982679c35faa401f0aad5478f
parents 9ab0b237 2e50bb1a

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

+1 −27
Original line number Original line Diff line number Diff line
@@ -218,11 +218,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        @Override

        @Override

        public void onUserRestrictionsChanged(int userId, Bundle newRestrictions,

        public void onUserRestrictionsChanged(int userId, Bundle newRestrictions,

                Bundle prevRestrictions) {

                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 =

            final boolean bluetoothDisallowed =

                    newRestrictions.getBoolean(UserManager.DISALLOW_BLUETOOTH);

                    newRestrictions.getBoolean(UserManager.DISALLOW_BLUETOOTH);

            if ((mEnable || mEnableExternal) && bluetoothDisallowed) {

            if ((mEnable || mEnableExternal) && bluetoothDisallowed) {
@@ -233,7 +228,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                            e);

                            e);

                }

                }

            }

            }

            updateOppLauncherComponentState(bluetoothDisallowed);

        }

        }

    };

    };
@@ -959,9 +953,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        UserManagerInternal userManagerInternal =

        UserManagerInternal userManagerInternal =

                LocalServices.getService(UserManagerInternal.class);

                LocalServices.getService(UserManagerInternal.class);

        userManagerInternal.addUserRestrictionsListener(mUserRestrictionsListener);

        userManagerInternal.addUserRestrictionsListener(mUserRestrictionsListener);

        final boolean isBluetoothDisallowed = isBluetoothDisallowed();

        if (isBluetoothDisallowed()) {

        updateOppLauncherComponentState(isBluetoothDisallowed);

        if (isBluetoothDisallowed) {

            return;

            return;

        }

        }

        if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) {

        if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) {
@@ -2019,24 +2011,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

    @Override

    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);