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

Merge changes from topic "screen_lock_settings_log"

Browse Source 
* changes:
  Remove broken tests
  Log screen lock settings using its own constant
This commit is contained in:
TreeHugger Robot
2017-12-06 02:18:03 +00:00
committed by Android (Google) Code Review
parent 73ee3a6bf3 0503686b37
commit 37e4d92a09
3 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/security/screenlock/ScreenLockSettings.java
View File

@@ -46,7 +46,7 @@ public class ScreenLockSettings extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SECURITY;
return MetricsProto.MetricsEvent.SCREEN_LOCK_SETTINGS;
}
@Override

28
tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
View File

@@ -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);
}

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

@@ -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);
}