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

Commit 0b9932ea authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents f5358d3d 7fc13838

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

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.content.IntentFilter; 
import android.os.Bundle;

import android.support.annotation.VisibleForTesting;



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.
@@ -63,6 +65,8 @@ public class BluetoothPairingDialog extends Activity { 
    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        Intent intent = getIntent();

        mBluetoothPairingController = new BluetoothPairingController(intent, this);

        // build the dialog fragment

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

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,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
@@ -72,6 +74,8 @@ public class RequestPermissionActivity extends Activity implements 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        setResult(Activity.RESULT_CANCELED);



        // Note: initializes mLocalAdapter and returns true on error