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

Commit ba81fe61 authored by Daniel Sandler's avatar Daniel Sandler Committed by Automerger Merge Worker
Browse files

Merge "Launch the platform easter egg in a new task." into tm-qpr-dev am: e43bf3cd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20003711



Change-Id: I794c118911d6d2fa47ff9190a6108fc1e3d0f11c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fdd2f017 e43bf3cd

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon 


            final Intent intent = new Intent(Intent.ACTION_MAIN)

                    .setClassName(

                            "android", com.android.internal.app.PlatLogoActivity.class.getName());

                            "android", com.android.internal.app.PlatLogoActivity.class.getName())

                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            try {

                mContext.startActivity(intent);

            } catch (Exception e) {

tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java

+9 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.Intent;

import android.os.Build;

import android.os.UserManager;
@@ -33,6 +34,7 @@ import androidx.preference.Preference; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;
@@ -85,7 +87,13 @@ public class FirmwareVersionDetailPreferenceControllerTest { 


        mController.handlePreferenceTreeClick(mPreference);



        verify(mContext).startActivity(any());

        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);

        verify(mContext).startActivity(captor.capture());

        assertThat(captor.getValue().getAction()).isEqualTo(Intent.ACTION_MAIN);

        assertThat(captor.getValue().getComponent().getPackageName()).isEqualTo("android");

        assertThat(captor.getValue().getComponent().getClassName()).isEqualTo(

                com.android.internal.app.PlatLogoActivity.class.getName());

        assertThat(captor.getValue().getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK).isGreaterThan(0);

    }



    @Test