Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index bcd4d77..12c1d77 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -24,6 +24,7 @@
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 @@
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,