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

Commit e1d255db authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Vasyl Gello
Browse files

Protect account chooser activities against overlay. 

Bug: 172841550
Test: manual
Merged-In: I1a16808426934f4a8d12410576d769443e4c2a04
Merged-In: I3cd5a94386f15cf60a7fe3095b00815e4a6485ae
Change-Id: I35dc86b5721a4531447a6d99d6c30f23543130cb
(cherry picked from commit fedbadf5)
parent 6183c32e

core/java/android/accounts/ChooseAccountActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -52,7 +52,9 @@ public class ChooseAccountActivity extends Activity { 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(

                android.view.WindowManager.LayoutParams

                        .PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        mAccounts = getIntent().getParcelableArrayExtra(AccountManager.KEY_ACCOUNTS);

        mAccountManagerResponse =

                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_MANAGER_RESPONSE);

core/java/android/accounts/ChooseAccountTypeActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.widget.ArrayAdapter; 
import android.widget.ImageView;

import android.widget.ListView;

import android.widget.TextView;



import com.android.internal.R;



import java.util.ArrayList;
@@ -51,7 +52,9 @@ public class ChooseAccountTypeActivity extends Activity { 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(

                android.view.WindowManager.LayoutParams

                        .PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        if (Log.isLoggable(TAG, Log.VERBOSE)) {

            Log.v(TAG, "ChooseAccountTypeActivity.onCreate(savedInstanceState="

                    + savedInstanceState + ")");

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+5 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package android.accounts;



import com.google.android.collect.Sets;



import android.app.Activity;

import android.app.ActivityManagerNative;

import android.content.Intent;
@@ -38,6 +36,8 @@ import android.widget.TextView; 


import com.android.internal.R;



import com.google.android.collect.Sets;



import java.io.IOException;

import java.util.ArrayList;

import java.util.HashSet;
@@ -136,7 +136,9 @@ public class ChooseTypeAndAccountActivity extends Activity 
            Log.v(TAG, "ChooseTypeAndAccountActivity.onCreate(savedInstanceState="

                    + savedInstanceState + ")");

        }



        getWindow().addPrivateFlags(

               android.view.WindowManager.LayoutParams

                        .PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        String message = null;



        try {