diff options
| author | Joanne Chung <joannechung@google.com> | 2021-04-12 16:15:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 16:15:56 +0000 |
| commit | 312087f91fbca210ad173fd6d691ecf491662078 (patch) | |
| tree | d1104a256d6b6c7d66f90a3f501445091e630d75 /services/java | |
| parent | 61e5fada68a2b362cc3a9564c4e4acd97f5de354 (diff) | |
| parent | 279a38e1475089127ba87e4b1e37a0925de68c83 (diff) | |
Merge "Remove translation service feature." into sc-dev am: 279a38e147
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14112447
Change-Id: I387a396331301693d4a6e584d187303f00ce2eef
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 540fcbc9f721..04e1e8a1fb54 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -2528,10 +2528,12 @@ public final class SystemServer implements Dumpable { } // Translation manager service - if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TRANSLATION)) { + if (deviceHasConfigString(context, R.string.config_defaultTranslationService)) { t.traceBegin("StartTranslationManagerService"); mSystemServiceManager.startService(TRANSLATION_MANAGER_SERVICE_CLASS); t.traceEnd(); + } else { + Slog.d(TAG, "TranslationService not defined by OEM"); } // NOTE: ClipboardService depends on ContentCapture and Autofill |