Merge "Fix a bug where device index is not skipped correct." into pi-dev
diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
index 1c25399..c4d3abf 100644
--- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java
+++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
@@ -24,6 +24,7 @@
import android.net.Uri;
import android.os.Build;
import android.provider.Settings;
+import android.text.TextUtils;
import android.util.Log;
import com.android.settings.R;
@@ -32,7 +33,6 @@
import java.util.List;
import java.util.Locale;
-import java.util.Objects;
public interface DeviceIndexFeatureProvider {
@@ -96,10 +96,11 @@
}
static boolean skipIndex(Context context) {
- final boolean isSameVersion = Objects.equals(
+ final boolean isSameVersion = TextUtils.equals(
Settings.Secure.getString(context.getContentResolver(), INDEX_VERSION), VERSION);
- final boolean isSameLanguage = Objects.equals(
- Settings.Secure.getString(context.getContentResolver(), INDEX_LANGUAGE), LANGUAGE);
+ final boolean isSameLanguage = TextUtils.equals(
+ Settings.Secure.getString(context.getContentResolver(), INDEX_LANGUAGE),
+ LANGUAGE.toString());
return isSameLanguage && isSameVersion;
}
diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
index a900db0..ebba3f3 100644
--- a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
@@ -23,7 +23,6 @@
import android.app.Activity;
import android.app.job.JobScheduler;
-import android.os.Build;
import android.provider.Settings;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -113,15 +112,19 @@
@Test
public void updateIndex_enabled_provisioned_sameBuild_sameLang_shouldNotIndex() {
+ // Enabled
+ when(mProvider.isIndexingEnabled()).thenReturn(true);
+ // Provisioned
Settings.Global.putInt(mActivity.getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 1);
+ // Same build and same language
DeviceIndexFeatureProvider.setIndexState(mActivity);
- JobScheduler jobScheduler = mock(JobScheduler.class);
- when(mProvider.isIndexingEnabled()).thenReturn(true);
+
+ final JobScheduler jobScheduler = mock(JobScheduler.class);
when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler);
mProvider.updateIndex(mActivity, false);
- verify(mProvider, never()).index(any(), any(), any(), any(), any());
+ verify(jobScheduler, never()).schedule(any());
}
}