summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-03-17 20:02:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-17 20:02:24 +0000
commitf5f6487e5999f6b4984e03bf6fe831ed83f5f4b6 (patch)
tree8d09e19bbe3242c70d5de2e7ce24b2173e1a135a
parente9529bc4cb28176fddf1e7916c7791e5974f2fc3 (diff)
parentd8e585e7e5ce77e0bf8c11838387f012b9ab9a1a (diff)
downloadframeworks_base-f5f6487e5999f6b4984e03bf6fe831ed83f5f4b6.zip
frameworks_base-f5f6487e5999f6b4984e03bf6fe831ed83f5f4b6.tar.gz
frameworks_base-f5f6487e5999f6b4984e03bf6fe831ed83f5f4b6.tar.bz2
am d8e585e7: am 006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
* commit 'd8e585e7e5ce77e0bf8c11838387f012b9ab9a1a': Remove reflection instantiation of Accessibility
-rw-r--r--services/java/com/android/server/SystemServer.java5
1 files changed, 3 insertions, 2 deletions
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 android.view.WindowManager;
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 @@ public final class SystemServer {
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);
}