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

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

Merge "Protect account chooser activities against overlay." into qt-dev

parents 1a96cae4 6ff42dd2

core/java/android/accounts/ChooseAccountActivity.java

+5 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package android.accounts;



import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.content.Context;

import android.content.pm.PackageManager;
@@ -25,8 +24,8 @@ import android.graphics.drawable.Drawable; 
import android.os.Bundle;

import android.os.IBinder;

import android.os.Parcelable;

import android.os.RemoteException;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.util.Log;

import android.view.LayoutInflater;
@@ -37,6 +36,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;
@@ -60,6 +60,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 −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().addSystemFlags(

                android.view.WindowManager.LayoutParams

                        .SYSTEM_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

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

package android.accounts;



import android.app.ActivityTaskManager;

import com.google.android.collect.Sets;



import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.content.Intent;

import android.os.Bundle;

import android.os.IBinder;
@@ -39,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;
@@ -143,7 +142,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);

        String message = null;



        try {