diff options
| author | dcashman <dcashman@google.com> | 2014-11-26 17:22:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-26 17:23:01 +0000 |
| commit | 9fd6d9d9952b14bbef7e3f31250ae11a6a7a5b49 (patch) | |
| tree | 75ecc940d766321c5aed07a5b9347b678f2129d7 /services/java | |
| parent | 0e0dbf9367371a0315461f9afd5167d56fc9428c (diff) | |
| parent | 4e3f5d3fe41c0ecf68f5c5f2a4bb89ea79ffab15 (diff) | |
| download | frameworks_base-9fd6d9d9952b14bbef7e3f31250ae11a6a7a5b49.zip frameworks_base-9fd6d9d9952b14bbef7e3f31250ae11a6a7a5b49.tar.gz frameworks_base-9fd6d9d9952b14bbef7e3f31250ae11a6a7a5b49.tar.bz2 | |
Merge "Remove if(true) line."
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 266c69c..0ccb25c 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -524,23 +524,20 @@ public final class SystemServer { // Bring up services needed for UI. if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) { - //if (!disableNonCoreServices) { // TODO: View depends on these; mock them? - if (true) { - try { - Slog.i(TAG, "Input Method Service"); - imm = new InputMethodManagerService(context, wm); - ServiceManager.addService(Context.INPUT_METHOD_SERVICE, imm); - } catch (Throwable e) { - reportWtf("starting Input Manager Service", e); - } + try { + Slog.i(TAG, "Input Method Service"); + imm = new InputMethodManagerService(context, wm); + ServiceManager.addService(Context.INPUT_METHOD_SERVICE, imm); + } catch (Throwable e) { + reportWtf("starting Input Manager Service", e); + } - try { - Slog.i(TAG, "Accessibility Manager"); - ServiceManager.addService(Context.ACCESSIBILITY_SERVICE, - new AccessibilityManagerService(context)); - } catch (Throwable e) { - reportWtf("starting Accessibility Manager", e); - } + try { + Slog.i(TAG, "Accessibility Manager"); + ServiceManager.addService(Context.ACCESSIBILITY_SERVICE, + new AccessibilityManagerService(context)); + } catch (Throwable e) { + reportWtf("starting Accessibility Manager", e); } } |