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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-20 16:50:13 +00:00
committed by Android (Google) Code Review
parent d4f5215286 d9e1871fde
commit a114c09c7a
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SettingsActivity.java
View File

@@ -648,7 +648,6 @@ public class SettingsActivity extends SettingsBaseActivity
PackageManager pm = getPackageManager(); PackageManager pm = getPackageManager();
final UserManager um = UserManager.get(this); final UserManager um = UserManager.get(this);
final boolean isAdmin = um.isAdminUser(); final boolean isAdmin = um.isAdminUser();
final FeatureFactory featureFactory = FeatureFactory.getFactory(this);
boolean somethingChanged = false; boolean somethingChanged = false;
final String packageName = getPackageName(); final String packageName = getPackageName();
final StringBuilder changedList = new StringBuilder(); final StringBuilder changedList = new StringBuilder();
@@ -661,7 +660,6 @@ public class SettingsActivity extends SettingsBaseActivity
pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin) pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin)
|| somethingChanged; || somethingChanged;
// Enable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise // Enable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise
// enable DataPlanUsageSummaryActivity. // enable DataPlanUsageSummaryActivity.
somethingChanged = setTileEnabled(changedList, somethingChanged = setTileEnabled(changedList,

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

@@ -105,7 +105,7 @@ public interface DeviceIndexFeatureProvider {
// soon as possible. // soon as possible.
context.getSystemService(JobScheduler.class).schedule( context.getSystemService(JobScheduler.class).schedule(
new JobInfo.Builder(jobId, jobComponent) new JobInfo.Builder(jobId, jobComponent)
.setPersisted(true) .setPersisted(false)
.setMinimumLatency(1000) .setMinimumLatency(1000)
.setOverrideDeadline(1) .setOverrideDeadline(1)
.build()); .build());