PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Sandler
2022-09-21 14:11:57 +00:00
committed by Android (Google) Code Review
parent 581fd171b5 5eeb6c3792
commit e43bf3cd9d
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
View File

@@ -98,7 +98,8 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon
final Intent intent = new Intent(Intent.ACTION_MAIN) final Intent intent = new Intent(Intent.ACTION_MAIN)
.setClassName( .setClassName(
"android", com.android.internal.app.PlatLogoActivity.class.getName()); "android", com.android.internal.app.PlatLogoActivity.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try { try {
mContext.startActivity(intent); mContext.startActivity(intent);
} catch (Exception e) { } catch (Exception e) {

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

@@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.UserManager; import android.os.UserManager;
@@ -33,6 +34,7 @@ import androidx.preference.Preference;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@@ -85,7 +87,13 @@ public class FirmwareVersionDetailPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference); 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 @Test