commit a114c09c7af0c58a80ae363b65671dd98503de54
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 20 16:50:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 20 16:50:13 2018 +0000
tree e8e0b928de2ffa6c9f11ed6c5433b40af40e2d88
parent d4f52152867d05632dbdd6e61a16888605727f06
parent d9e1871fde97f2063f46d510ed3111d479ef3c06

Merge "Don't persist device index job across reboot"

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index ffce321..ea2370c 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -648,7 +648,6 @@
         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 @@
                 pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin)
                 || somethingChanged;
 
-
         // Enable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise
         // enable DataPlanUsageSummaryActivity.
         somethingChanged = setTileEnabled(changedList,

src/com/android/settings/search/DeviceIndexFeatureProvider.java

diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
index a55fcff..f777f71 100644
--- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java
+++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
@@ -105,7 +105,7 @@
         // soon as possible.
         context.getSystemService(JobScheduler.class).schedule(
                 new JobInfo.Builder(jobId, jobComponent)
-                        .setPersisted(true)
+                        .setPersisted(false)
                         .setMinimumLatency(1000)
                         .setOverrideDeadline(1)
                         .build());