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

Unverified Commit d2c786ec authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-9.0.0_r65' of... 

Merge tag 'android-security-9.0.0_r65' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-16.0_merge_android-security-9.0.0_r65

Android security 9.0.0 release 65

* tag 'android-security-9.0.0_r65' of https://android.googlesource.com/platform/packages/apps/Settings:
  Prevent overlay drawing on top of Bluetooth activity dialog
  Add bluetooth package to permission request intent
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog

Change-Id: I4834e100946169b635a369994bc5953ed339dd69
parents 6437b8cf 5caaad91

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

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,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.
@@ -78,6 +80,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);

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.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import static com.android.internal.notification.NotificationAccessConfirmationActivityContract

        .EXTRA_COMPONENT_NAME;

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

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



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



        mComponentName = getIntent().getParcelableExtra(EXTRA_COMPONENT_NAME);