Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a114c09c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d4f52152 d9e1871f

src/com/android/settings/SettingsActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -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,

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

+1 −1
Original line number Diff line number Diff line
@@ -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());