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

Commit 338c801e authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Prevent drawing on top of Bluetooth activities 

Mark them all as system activities.

Bug: 169851881
Change-Id: I6ca0f72a91735ed021d348dc9beb8c1d1bd518b1
parent ec12b558

android/app/src/com/android/bluetooth/AlertActivity.java

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


package android.bluetooth;



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



import android.app.Activity;

import android.app.AlertDialog;

import android.app.Dialog;
@@ -46,6 +48,8 @@ public abstract class AlertActivity extends Activity implements DialogInterface. 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        requestWindowFeature(Window.FEATURE_NO_TITLE);

        mAlertBuilder = new AlertDialog.Builder(this);

        mAlertBuilder.setOnDismissListener(this);

android/app/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 


package com.android.bluetooth.opp;



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



import android.bluetooth.AlertActivity;

import android.content.DialogInterface;

import android.content.Intent;
@@ -53,6 +55,7 @@ public class BluetoothOppBtEnableActivity extends AlertActivity 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        // Set up the "dialog"

        mOppManager = BluetoothOppManager.getInstance(this);

        mOppManager.mSendingFlag = false;

android/app/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 


package com.android.bluetooth.opp;



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



import android.bluetooth.AlertActivity;

import android.bluetooth.BluetoothAdapter;

import android.content.BroadcastReceiver;
@@ -68,6 +70,7 @@ public class BluetoothOppBtEnablingActivity extends AlertActivity { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        // If BT is already enabled jus return.

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        if (adapter.isEnabled()) {

android/app/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 


package com.android.bluetooth.opp;



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



import android.bluetooth.AlertActivity;

import android.content.DialogInterface;

import android.content.Intent;
@@ -51,6 +53,7 @@ public class BluetoothOppBtErrorActivity extends AlertActivity 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        Intent intent = getIntent();

        String errorTitle = intent.getStringExtra("title");

        String errorContent = intent.getStringExtra("content");

android/app/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 


package com.android.bluetooth.opp;



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



import android.bluetooth.AlertActivity;

import android.content.BroadcastReceiver;

import android.content.ContentValues;
@@ -93,6 +95,7 @@ public class BluetoothOppIncomingFileConfirmActivity extends AlertActivity 
        }

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        Intent intent = getIntent();

        mUri = intent.getData();

        mTransInfo = new BluetoothOppTransferInfo();