commit ad70bc6c310f54d4810e67b49e7881c1f33a1d83
author Sudheer Shanka <sudheersai@google.com> Thu Sep 29 12:58:04 2016 -0700
committer Sudheer Shanka <sudheersai@google.com> Fri Sep 30 12:17:37 2016 -0700
tree 4e7c1dc6158d8056048e52b029cfe06fb73637b8
parent 4c9f9d683ba929bfa433119b614667fa77704b56

Update ClipboardService to extend SystemService.

Test: Existing tests still passing.
      cts-tradefed run singleCommand cts-dev --module CtsTextTestCases -t android.text.cts.ClipboardManagerTest
      cts-tradefed run singleCommand cts-dev --module CtsContentTestCases -t android.content.cts.ClipboardManagerTest
      cts-tradefed run singleCommand cts-dev --module CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testCrossProfileCopyPaste
Change-Id: Ibca156a412219f11a53f2a9250954b30b650b1aa

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index aba4dc0..6fbe0ff 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -859,12 +859,7 @@
 
             if (!disableNonCoreServices) {
                 traceBeginAndSlog("StartClipboardService");
-                try {
-                    ServiceManager.addService(Context.CLIPBOARD_SERVICE,
-                            new ClipboardService(context));
-                } catch (Throwable e) {
-                    reportWtf("starting Clipboard Service", e);
-                }
+                mSystemServiceManager.startService(ClipboardService.class);
                 traceEnd();
             }