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

Commit 6a3036bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I4e63a98c,Id2f32621,Ia6113f08 

* changes:
  Set flag to disallow non system window overlays to prevent tapjacking
  Set flag to disallow non system window overlays to prevent tapjacking
  Set flag to disallow non system window overlays to prevent tapjacking
parents 7fa3f5ab 2844d75a

packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.UserHandle;

import android.util.Log;

import android.view.WindowManager;



import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;
@@ -47,6 +48,8 @@ public class UsbAccessoryUriActivity extends AlertActivity 


    @Override

    public void onCreate(Bundle icicle) {

       getWindow().addSystemFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

       super.onCreate(icicle);



       Intent intent = getIntent();

packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.SystemProperties;

import android.util.Log;

import android.view.WindowManager;



import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;
@@ -51,6 +52,8 @@ public class UsbDebuggingSecondaryUserActivity extends AlertActivity 


    @Override

    public void onCreate(Bundle icicle) {

        getWindow().addSystemFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        super.onCreate(icicle);



        if (SystemProperties.getInt("service.adb.tcp.port", 0) == 0) {

packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.UserHandle;

import android.util.Log;

import android.view.WindowManager;

import android.widget.CheckBox;



import com.android.internal.app.ResolverActivity;
@@ -60,6 +61,8 @@ public class UsbResolverActivity extends ResolverActivity { 


    @Override

    protected void onCreate(Bundle savedInstanceState) {

        getWindow().addSystemFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        Intent intent = getIntent();

        Parcelable targetParcelable = intent.getParcelableExtra(Intent.EXTRA_INTENT);

        if (!(targetParcelable instanceof Intent)) {