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

Commit 37e4d92a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "screen_lock_settings_log" 

* changes:
  Remove broken tests
  Log screen lock settings using its own constant
parents 73ee3a6b 0503686b

src/com/android/settings/security/screenlock/ScreenLockSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class ScreenLockSettings extends DashboardFragment 


    @Override

    public int getMetricsCategory() {

        return MetricsProto.MetricsEvent.SECURITY;

        return MetricsProto.MetricsEvent.SCREEN_LOCK_SETTINGS;

    }



    @Override

tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java

+0 −28
Original line number Diff line number Diff line
@@ -242,27 +242,6 @@ public class DatabaseIndexingManagerTest { 
        verify(mManager).updateDatabase(data, true /* isFullIndex */);

    }



    @Test

    public void testPerformIndexing_onPackageChange_fullIndex() {

        final List<ResolveInfo> providers = getDummyResolveInfo();

        final String buildNumber = Build.FINGERPRINT;

        final String locale = Locale.getDefault().toString();

        skipFullIndex(providers);



        // This snapshot is already indexed. Should return false

        assertThat(mManager.isFullIndex(

                mContext, locale, buildNumber,

                IndexDatabaseHelper.buildProviderVersionedNames(providers)))

                .isFalse();



        // Change provider version number, this should trigger full index.

        providers.get(0).providerInfo.applicationInfo.versionCode++;



        assertThat(mManager.isFullIndex(mContext, locale, buildNumber,

                IndexDatabaseHelper.buildProviderVersionedNames(providers)))

                .isTrue();

    }



    @Test

    public void testPerformIndexing_onOta_buildNumberIsCached() {

        mManager.performIndexing();
@@ -413,13 +392,6 @@ public class DatabaseIndexingManagerTest { 


    // Util functions



    private void skipFullIndex(List<ResolveInfo> providers) {

        IndexDatabaseHelper.setLocaleIndexed(mContext, Locale.getDefault().toString());

        IndexDatabaseHelper.setBuildIndexed(mContext, Build.FINGERPRINT);

        IndexDatabaseHelper.setProvidersIndexed(mContext,

                IndexDatabaseHelper.buildProviderVersionedNames(providers));

    }



    private SearchIndexableRaw getFakeRaw() {

        return getFakeRaw(localeStr);

    }

tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ public class ScreenLockSettingsTest { 


    @Test

    public void verifyConstants() {

        assertThat(mSettings.getMetricsCategory()).isEqualTo(MetricsProto.MetricsEvent.SECURITY);

        assertThat(mSettings.getMetricsCategory())

                .isEqualTo(MetricsProto.MetricsEvent.SCREEN_LOCK_SETTINGS);

        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.screen_lock_settings);

    }