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

Commit 0e036096 authored by Bill Yi's avatar Bill Yi Committed by Gerrit Code Review
Browse files

Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE"

parents 18b44099 0f8ac7d1

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

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import com.android.internal.app.AlertActivity; 
import com.android.internal.app.AlertController;

import com.android.settings.R;



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



/**

 * BluetoothPermissionActivity shows a dialog for accepting incoming

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

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(SYSTEM_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);

src/com/android/settings/notification/NotificationAccessConfirmationActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


package com.android.settings.notification;



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



import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_COMPONENT_NAME;

import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_PACKAGE_TITLE;

import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_USER_ID;
@@ -55,6 +57,8 @@ public class NotificationAccessConfirmationActivity extends Activity 
    protected void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        mNm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);



        mComponentName = getIntent().getParcelableExtra(EXTRA_COMPONENT_NAME);