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

Commit 6f75f122 authored by /e/ robot's avatar /e/ robot
Browse files

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

parents b10a5b0d f1367e9f

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

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ import com.android.settingslib.bluetooth.LocalBluetoothProfile; 


import java.util.Locale;



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



/**

 * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation

 * for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.
@@ -103,6 +105,8 @@ public final class BluetoothPairingDialog extends AlertActivity implements 
        super.onCreate(savedInstanceState);

        mReceiverRegistered = false;



        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        Intent intent = getIntent();

        if (!intent.getAction().equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {

            Log.e(TAG, "Error: this activity may be started only with intent " +

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

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver; 
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;

import com.android.settingslib.bluetooth.LocalBluetoothManager;



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



/**

 * RequestPermissionActivity asks the user whether to enable discovery. This is

 * usually started by an application wanted to start bluetooth and or discovery
@@ -97,6 +99,8 @@ public class RequestPermissionActivity extends Activity implements 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        // Note: initializes mLocalAdapter and returns true on error

        if (parseIntent()) {

            finish();