From d9e1871fde97f2063f46d510ed3111d479ef3c06 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 19 Sep 2018 16:08:56 -0700 Subject: [PATCH] Don't persist device index job across reboot Change-Id: I9bd25c7f266dded730918ec517e842c2b6ee9b1a Fixes: 115930605 Test: manual --- src/com/android/settings/SettingsActivity.java | 2 -- src/com/android/settings/search/DeviceIndexFeatureProvider.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index ffce321a45..ea2370c863 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -648,7 +648,6 @@ public class SettingsActivity extends SettingsBaseActivity PackageManager pm = getPackageManager(); final UserManager um = UserManager.get(this); final boolean isAdmin = um.isAdminUser(); - final FeatureFactory featureFactory = FeatureFactory.getFactory(this); boolean somethingChanged = false; final String packageName = getPackageName(); final StringBuilder changedList = new StringBuilder(); @@ -661,7 +660,6 @@ public class SettingsActivity extends SettingsBaseActivity pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin) || somethingChanged; - // Enable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise // enable DataPlanUsageSummaryActivity. somethingChanged = setTileEnabled(changedList, diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java index a55fcff809..f777f710fe 100644 --- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java +++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java @@ -105,7 +105,7 @@ public interface DeviceIndexFeatureProvider { // soon as possible. context.getSystemService(JobScheduler.class).schedule( new JobInfo.Builder(jobId, jobComponent) - .setPersisted(true) + .setPersisted(false) .setMinimumLatency(1000) .setOverrideDeadline(1) .build()); -- 2.11.0