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

Commit e3bc83b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed elapsed_time_millis in SettingsUIChanged event" into main

parents 781cbcdb 2f39a808

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ 
            <intent-filter>

                <action android:name="android.intent.action.USER_INITIALIZE"/>

                <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>

                <action android:name="com.google.android.setupwizard.SETUP_WIZARD_FINISHED"/>

            </intent-filter>

        </receiver>

src/com/android/settings/SettingsInitialize.java

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.util.Log; 
import androidx.annotation.VisibleForTesting;



import com.android.settings.activityembedding.ActivityEmbeddingUtils;

import com.android.settings.core.instrumentation.ElapsedTimeUtils;

import com.android.settings.homepage.DeepLinkHomepageActivity;

import com.android.settings.search.SearchStateReceiver;

import com.android.settingslib.utils.ThreadUtils;
@@ -69,6 +70,7 @@ public class SettingsInitialize extends BroadcastReceiver { 
        webviewSettingSetup(context, pm, userInfo);

        ThreadUtils.postOnBackgroundThread(() -> refreshExistingShortcuts(context));

        enableTwoPaneDeepLinkActivityIfNecessary(pm, context);

        storeSuwCompleteTimestamp(context, broadcast);

    }



    private void managedProfileSetup(Context context, final PackageManager pm, Intent broadcast,
@@ -161,4 +163,10 @@ public class SettingsInitialize extends BroadcastReceiver { 
        pm.setComponentEnabledSetting(searchStateReceiver, enableState,

                PackageManager.DONT_KILL_APP);

    }



    private void storeSuwCompleteTimestamp(Context context, Intent broadcast) {

        if (SetupWizardUtils.ACTION_SETUP_WIZARD_FINISHED.equals(broadcast.getAction())) {

            ElapsedTimeUtils.storeSuwFinishedTimestamp(context, System.currentTimeMillis());

        }

    }

}

src/com/android/settings/SetupWizardUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ import java.util.Arrays; 


public class SetupWizardUtils {



    public static final String ACTION_SETUP_WIZARD_FINISHED =

            "com.google.android.setupwizard.SETUP_WIZARD_FINISHED";



    public static String getThemeString(Intent intent) {

        String theme = intent.getStringExtra(WizardManagerHelper.EXTRA_THEME);

        if (theme == null) {

tests/robotests/src/com/android/settings/SettingsInitializeTest.java

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.pm.ShortcutInfo; 


import android.content.pm.ShortcutManager;



import com.android.settings.core.instrumentation.ElapsedTimeUtils;

import java.util.Collections;

import org.junit.Before;

import org.junit.Test;
@@ -96,4 +97,12 @@ public class SettingsInitializeTest { 
        assertThat(updatedShortcuts).hasSize(1);

        assertThat(updatedShortcuts.get(0)).isSameInstanceAs(info);

    }



    @Test

    public void onReceive_suwFinished_shouldHaveElapsedTime() {

        mSettingsInitialize.onReceive(mContext, new Intent(SetupWizardUtils.ACTION_SETUP_WIZARD_FINISHED));



        final long elapsedTime = ElapsedTimeUtils.getElapsedTime(System.currentTimeMillis());

        assertThat(elapsedTime).isNotEqualTo(-1L);

    }

}