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

Merge "Fix a bug where device index is not skipped correct." into pi-dev

Browse Source 
am: 75b3e6f302

Change-Id: Ifba1a52d5f9a3d3ca69a13ef769d22f0bf1402f9
This commit is contained in:
Fan Zhang
2018-05-29 12:06:31 -07:00
committed by android-build-merger
parent 7fcbaf4ac9 75b3e6f302
commit 9bc1f54268
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/search/DeviceIndexFeatureProvider.java
View File

@@ -24,6 +24,7 @@ import android.content.Context;
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 com.android.settings.slices.SettingsSliceProvider;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
public interface DeviceIndexFeatureProvider {
@@ -96,10 +96,11 @@ public interface DeviceIndexFeatureProvider {
}
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;
}

11
tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
View File

@@ -23,7 +23,6 @@ import static org.mockito.Mockito.when;
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 @@ public class DeviceIndexFeatureProviderTest {
@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());
}
}