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

Commit 6f01f95a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix LaunchAnyWheere via an Evil Card in QuickAccessWallet." into... 

Merge "Fix LaunchAnyWheere via an Evil Card in QuickAccessWallet." into sc-v2-dev am: 34d9f068 am: 210765e8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16564840

Change-Id: I4dd092c854529a87217c33cf08f0128e10cf4a47
parents 2c4875b2 210765e8

packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java

+1 −2
Original line number Diff line number Diff line
@@ -223,8 +223,7 @@ public class WalletScreenController implements 
        }

        mUiEventLogger.log(WalletUiEvent.QAW_CLICK_CARD);



        mActivityStarter.startActivity(

                ((QAWalletCardViewInfo) cardInfo).mWalletCard.getPendingIntent().getIntent(), true);

        mActivityStarter.startPendingIntentDismissingKeyguard(cardInfo.getPendingIntent());

    }



    @Override

packages/SystemUI/tests/src/com/android/systemui/wallet/ui/WalletScreenControllerTest.java

+6 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.view.View.VISIBLE; 


import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -96,7 +95,7 @@ public class WalletScreenControllerTest extends SysuiTestCase { 
    @Mock

    UiEventLogger mUiEventLogger;

    @Captor

    ArgumentCaptor<Intent> mIntentCaptor;

    ArgumentCaptor<PendingIntent> mIntentCaptor;

    @Captor

    ArgumentCaptor<QuickAccessWalletClient.OnWalletCardsRetrievedCallback> mCallbackCaptor;

    private WalletScreenController mController;
@@ -374,10 +373,12 @@ public class WalletScreenControllerTest extends SysuiTestCase { 


        mController.onCardClicked(walletCardViewInfo);



        verify(mActivityStarter).startActivity(mIntentCaptor.capture(), eq(true));

        verify(mActivityStarter).startPendingIntentDismissingKeyguard(mIntentCaptor.capture());



        assertEquals(mWalletIntent.getAction(), mIntentCaptor.getValue().getAction());

        assertEquals(mWalletIntent.getComponent(), mIntentCaptor.getValue().getComponent());

        Intent actualIntent = mIntentCaptor.getValue().getIntent();



        assertEquals(mWalletIntent.getAction(), actualIntent.getAction());

        assertEquals(mWalletIntent.getComponent(), actualIntent.getComponent());



        verify(mUiEventLogger, times(1)).log(WalletUiEvent.QAW_CLICK_CARD);

    }