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

Unverified Commit b22b25a2 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-8.1.0_r86' into staging/lineage-15.1_merge_android-security-8.1.0_r86 

Android Security 8.1.0 Release 86 (7070700)

* tag 'android-security-8.1.0_r86':
  Protect account chooser activities against overlay.

Change-Id: Ifc0012d6481779afd61cdb0ca6f2ddf001fbdaf4
parents 606445ff 9b277661

core/java/android/accounts/ChooseAccountActivity.java

+5 −1
Original line number Diff line number Diff line
@@ -24,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;
@@ -36,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;
@@ -59,6 +60,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.ActivityManager;

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;
@@ -142,7 +142,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 {