Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Work on issue #37815224: DeviceManagementService is incorrectly..." into oc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2017-05-02 17:45:46 +00:00
committed by Android (Google) Code Review
parent b3e92234fa d1f3df43c0
commit 72c0ab518a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/etc/platform.xml
View File

@@ -181,6 +181,9 @@
<allow-in-power-save package="com.android.cellbroadcastreceiver" /> <allow-in-power-save package="com.android.cellbroadcastreceiver" />
<allow-in-power-save package="com.android.shell" /> <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 --> <!-- These are the packages that are white-listed to be able to run as system user -->
<system-user-whitelisted-app package="com.android.settings" /> <system-user-whitelisted-app package="com.android.settings" />

3
services/core/java/com/android/server/job/JobServiceContext.java
View File

@@ -184,8 +184,7 @@ public class JobServiceContext extends IJobCallback.Stub implements ServiceConne
scheduleOpTimeOutLocked(); scheduleOpTimeOutLocked();
final Intent intent = new Intent().setComponent(job.getServiceComponent()); final Intent intent = new Intent().setComponent(job.getServiceComponent());
boolean binding = mContext.bindServiceAsUser(intent, this, boolean binding = mContext.bindServiceAsUser(intent, this,
Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND,
| Context.BIND_IMPORTANT_BACKGROUND,
new UserHandle(job.getUserId())); new UserHandle(job.getUserId()));
if (!binding) { if (!binding) {
if (DEBUG) { if (DEBUG) {