diff options
| author | Andrei Onea <andreionea@google.com> | 2019-07-25 19:04:15 +0100 |
|---|---|---|
| committer | Andrei-Valentin Onea <andreionea@google.com> | 2019-07-25 18:17:30 +0000 |
| commit | 4fd8dabd52587e117cde58b756d5ef0d9696c47f (patch) | |
| tree | 9fc51a5980744d3259a55ac1f3bd2d03271899b1 /services/java/com/android | |
| parent | 4565dd5de3cabef65262f3433fc76c8f48b3021c (diff) | |
| parent | 130e0ade7b3ed33038518c9eb8329cbee066ef2a (diff) | |
resolve merge conflicts of 130e0ade7b3ed33038518c9eb8329cbee066ef2a to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie8cfba397930a1bd5ec947f4834478bb629fa640
Merged-In: I19e5fbfefcf59e0b53b197ea8e9e3cb78439b4c4
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index d99f3e4ef53e..1919f505f40a 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -87,6 +87,7 @@ import com.android.server.biometrics.iris.IrisService; import com.android.server.broadcastradio.BroadcastRadioService; import com.android.server.camera.CameraServiceProxy; import com.android.server.clipboard.ClipboardService; +import com.android.server.compat.PlatformCompat; import com.android.server.connectivity.IpConnectivityMetrics; import com.android.server.contentcapture.ContentCaptureManagerInternal; import com.android.server.coverage.CoverageService; @@ -1089,6 +1090,11 @@ public final class SystemServer { traceBeginAndSlog("SignedConfigService"); SignedConfigService.registerUpdateReceiver(mSystemContext); traceEnd(); + + traceBeginAndSlog("PlatformCompat"); + ServiceManager.addService("platform_compat", new PlatformCompat(context)); + traceEnd(); + } catch (RuntimeException e) { Slog.e("System", "******************************************"); Slog.e("System", "************ Failure starting core service", e); |