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

Commit d8e53f27 authored by Benjamin Franz's avatar Benjamin Franz Committed by android-build-merger
Browse files

Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev 

automerge: ceee535c

* commit 'ceee535c':
  Block BluetoothPermissionRequest notification on managed profiles.
parents f58a646b ceee535c

src/com/android/settings/bluetooth/BluetoothPermissionRequest.java

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.os.PowerManager;

import android.os.UserManager;

import android.util.Log;



import com.android.settings.R;
@@ -56,6 +57,12 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 
        if (DEBUG) Log.d(TAG, "onReceive" + action);



        if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {

            UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);

            // skip the notification for managed profiles.

            if (com.android.settings.Utils.isManagedProfile(um)) {

                if (DEBUG) Log.d(TAG, "Blocking notification for managed profile.");

                return;

            }

            // convert broadcast intent into activity intent (same action string)

            mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);

            mRequestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,