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

Commit bdb50cb0 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat

parents d7cd1fc3 561f3c8f

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

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; 
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;

import com.android.settingslib.bluetooth.LocalBluetoothManager;



import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



/**

 * BluetoothPermissionActivity shows a dialog for accepting incoming

 * profile connection request from untrusted devices.
@@ -79,6 +81,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        Intent i = getIntent();

        String action = i.getAction();

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

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

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 
                // "Clear All Notifications" button



                Intent deleteIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);

                deleteIntent.setPackage("com.android.bluetooth");

                deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);

                deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,

                        BluetoothDevice.CONNECTION_ACCESS_NO);