diff options
| author | Michael Wright <michaelwr@google.com> | 2014-07-17 21:59:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 21:15:46 +0000 |
| commit | c7a845de4a9578e8093b6abcb90c6836d360d5b3 (patch) | |
| tree | 76e1882bac2721c903ccb310a6e2417cc2cf93b1 /services/java/com/android/server/SystemServer.java | |
| parent | 86f8a7425ba88c718a6ab8bba35cfbc9e314e8a0 (diff) | |
| parent | c39d47a8e7c74bd539104b0efab898ef6fc43ddf (diff) | |
| download | frameworks_base-c7a845de4a9578e8093b6abcb90c6836d360d5b3.zip frameworks_base-c7a845de4a9578e8093b6abcb90c6836d360d5b3.tar.gz frameworks_base-c7a845de4a9578e8093b6abcb90c6836d360d5b3.tar.bz2 | |
Merge "Add MediaProjection APIs." into lmp-dev
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index b224249..de929cb 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -72,6 +72,7 @@ import com.android.server.lights.LightsManager; import com.android.server.lights.LightsService; import com.android.server.media.MediaRouterService; import com.android.server.media.MediaSessionService; +import com.android.server.media.projection.MediaProjectionManagerService; import com.android.server.net.NetworkPolicyManagerService; import com.android.server.net.NetworkStatsService; import com.android.server.notification.NotificationManagerService; @@ -949,6 +950,10 @@ public final class SystemServer { mSystemServiceManager.startService(LauncherAppsService.class); } + if (!disableNonCoreServices) { + mSystemServiceManager.startService(MediaProjectionManagerService.class); + } + // Before things start rolling, be sure we have decided whether // we are in safe mode. final boolean safeMode = wm.detectSafeMode(); |