diff options
| author | 2017-05-02 17:51:20 +0000 | |
|---|---|---|
| committer | 2017-05-02 17:51:20 +0000 | |
| commit | c812cf27ab3d081cae5fd81bc2f4cfbd8014b01e (patch) | |
| tree | e37d50b8e0fbc2ab918c1b8501e04199e41f1b9d | |
| parent | 159f549c8fef049844ed39111451ce6fd4ba3e83 (diff) | |
| parent | 72c0ab518ad84ac8b2c85e1322f1147c8fe8e443 (diff) | |
Merge "Work on issue #37815224: DeviceManagementService is incorrectly..." into oc-dev
am: 72c0ab518a
Change-Id: I1987075221d0d5fa16483e6a41003b0394291d10
| -rw-r--r-- | data/etc/platform.xml | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/job/JobServiceContext.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 344f3c83ba6c..86ab3dc227f4 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -181,6 +181,9 @@ <allow-in-power-save package="com.android.cellbroadcastreceiver" /> <allow-in-power-save package="com.android.shell" /> + <!-- STOPSHIP(b/36856786): Revert this once it is fixed properly --> + <allow-in-power-save package="com.google.android.apps.enterprise.dmagent" /> + <!-- These are the packages that are white-listed to be able to run as system user --> <system-user-whitelisted-app package="com.android.settings" /> diff --git a/services/core/java/com/android/server/job/JobServiceContext.java b/services/core/java/com/android/server/job/JobServiceContext.java index 73beecfdd711..bdcf642d1aca 100644 --- a/services/core/java/com/android/server/job/JobServiceContext.java +++ b/services/core/java/com/android/server/job/JobServiceContext.java @@ -184,8 +184,7 @@ public class JobServiceContext extends IJobCallback.Stub implements ServiceConne scheduleOpTimeOutLocked(); final Intent intent = new Intent().setComponent(job.getServiceComponent()); boolean binding = mContext.bindServiceAsUser(intent, this, - Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND - | Context.BIND_IMPORTANT_BACKGROUND, + Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND, new UserHandle(job.getUserId())); if (!binding) { if (DEBUG) { |