diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-04-28 20:33:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-28 20:33:09 +0000 |
| commit | 734a78fb867384dfb84f5f42f65b4681562d62b5 (patch) | |
| tree | bdc85d0dc5b0ce4a9aeae848f3a7aa28973a6c45 /services | |
| parent | d937f2750c6edc2c1a03901605b22dad02b89147 (diff) | |
| parent | 8ea2d4512248ec612356f558ac35534c3e4c6db6 (diff) | |
| download | frameworks_base-734a78fb867384dfb84f5f42f65b4681562d62b5.zip frameworks_base-734a78fb867384dfb84f5f42f65b4681562d62b5.tar.gz frameworks_base-734a78fb867384dfb84f5f42f65b4681562d62b5.tar.bz2 | |
am 8ea2d451: Merge "Various CTS fixes" into klp-modular-dev
* commit '8ea2d4512248ec612356f558ac35534c3e4c6db6':
Various CTS fixes
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 208eefb..6845e8c 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -59,6 +59,7 @@ import com.android.server.am.ActivityManagerService; import com.android.server.am.BatteryStatsService; import com.android.server.clipboard.ClipboardService; import com.android.server.content.ContentService; +import com.android.server.devicepolicy.DevicePolicyManagerService; import com.android.server.display.DisplayManagerService; import com.android.server.dreams.DreamManagerService; import com.android.server.input.InputManagerService; @@ -107,8 +108,6 @@ public final class SystemServer { */ private static final String BACKUP_MANAGER_SERVICE_CLASS = "com.android.server.backup.BackupManagerService$Lifecycle"; - private static final String DEVICE_POLICY_MANAGER_SERVICE_CLASS = - "com.android.server.devicepolicy.DevicePolicyManagerService$Lifecycle"; private static final String APPWIDGET_SERVICE_CLASS = "com.android.server.appwidget.AppWidgetService"; private static final String PRINT_MANAGER_SERVICE_CLASS = @@ -538,9 +537,9 @@ public final class SystemServer { } try { - if (pm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN)) { - mSystemServiceManager.startService(DEVICE_POLICY_MANAGER_SERVICE_CLASS); - } + // Always start the Device Policy Manager, so that the API is compatible with + // API8. + mSystemServiceManager.startService(DevicePolicyManagerService.Lifecycle.class); } catch (Throwable e) { reportWtf("starting DevicePolicyService", e); } |