summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2017-07-26 20:43:14 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-26 20:43:14 +0000
commit1e868e444b6dc6f44f4f27391a287ad7e926c797 (patch)
treeb1822f816336859a28b28793f3c4137a6b09f937
parentd112e6391b84b55d24eb38e0f20cb478abf52023 (diff)
parenta49681fab82bcbc51fddab2705f82d3a3af7170d (diff)
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
am: a49681fab8 Change-Id: I67951e184ef30e59e11d26cf3eecdec65dc758b0
-rw-r--r--services/core/java/com/android/server/job/JobSchedulerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index 98c65fd487ca..7cacdb8383f5 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -355,11 +355,11 @@ public final class JobSchedulerService extends com.android.server.SystemService
synchronized (mLock) {
try {
mParser.setString(Settings.Global.getString(mResolver,
- Settings.Global.ALARM_MANAGER_CONSTANTS));
+ Settings.Global.JOB_SCHEDULER_CONSTANTS));
} catch (IllegalArgumentException e) {
// Failed to parse the settings string, log this and move on
// with defaults.
- Slog.e(TAG, "Bad device idle settings", e);
+ Slog.e(TAG, "Bad jobscheduler settings", e);
}
MIN_IDLE_COUNT = mParser.getInt(KEY_MIN_IDLE_COUNT,