commit f5f6487e5999f6b4984e03bf6fe831ed83f5f4b6
author Adam Lesinski <adamlesinski@google.com> Mon Mar 17 20:02:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 17 20:02:24 2014 +0000
tree 8d09e19bbe3242c70d5de2e7ce24b2173e1a135a
parent e9529bc4cb28176fddf1e7916c7791e5974f2fc3
parent d8e585e7e5ce77e0bf8c11838387f012b9ab9a1a

am d8e585e7: am 006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev

* commit 'd8e585e7e5ce77e0bf8c11838387f012b9ab9a1a':
  Remove reflection instantiation of Accessibility

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 b498c0c..b3f22b1 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -52,6 +52,7 @@
 import com.android.internal.R;
 import com.android.internal.os.BinderInternal;
 import com.android.internal.os.SamplingProfilerIntegration;
+import com.android.server.accessibility.AccessibilityManagerService;
 import com.android.server.accounts.AccountManagerService;
 import com.android.server.am.ActivityManagerService;
 import com.android.server.am.BatteryStatsService;
@@ -481,8 +482,8 @@
 
                 try {
                     Slog.i(TAG, "Accessibility Manager");
-                    ServiceManager.addService(Context.ACCESSIBILITY_SERVICE, (IBinder)
-                            getClass().getClassLoader().loadClass("com.android.server.accessibility.AccessibilityManagerService").getConstructor(Context.class).newInstance(context));
+                    ServiceManager.addService(Context.ACCESSIBILITY_SERVICE,
+                            new AccessibilityManagerService(context));
                 } catch (Throwable e) {
                     reportWtf("starting Accessibility Manager", e);
                 }