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

Commit 89a8e216 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Android (Google) Code Review
Browse files

Merge "Protect account chooser activities against overlay."

parents a1c82b23 7563c0bb

core/java/android/accounts/ChooseAccountActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,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.HashMap;
@@ -56,6 +57,9 @@ public class ChooseAccountActivity extends Activity { 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        getWindow().addSystemFlags(

                android.view.WindowManager.LayoutParams

                        .SYSTEM_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 −0
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,6 +52,9 @@ public class ChooseAccountTypeActivity extends Activity { 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        getWindow().addSystemFlags(

                android.view.WindowManager.LayoutParams

                        .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



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

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

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+5 −2
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.content.Intent;

import android.os.Bundle;
@@ -35,6 +33,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;
@@ -139,6 +139,9 @@ public class ChooseTypeAndAccountActivity extends Activity 
            Log.v(TAG, "ChooseTypeAndAccountActivity.onCreate(savedInstanceState="

                    + savedInstanceState + ")");

        }

        getWindow().addSystemFlags(

                android.view.WindowManager.LayoutParams

                        .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        mCallingUid = getLaunchedFromUid();

        mCallingPackage = getLaunchedFromPackage();