Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO NOT MERGE] Revert "Revert "[DO NOT MERGE] Remove selection toolbar code from build time"" am: 8be1773964

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992748

Change-Id: I93dcd232eb6205c8c6361406b4ccd0863a0dea46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joanne Chung
2022-09-23 09:38:07 +00:00
committed by Automerger Merge Worker
parent c5dfcc89d7 8be1773964
commit 62d698f8e8
6 changed files with 9 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/SystemServer.java
View File

@@ -338,8 +338,6 @@ public final class SystemServer implements Dumpable {
"com.android.server.contentcapture.ContentCaptureManagerService";
private static final String TRANSLATION_MANAGER_SERVICE_CLASS =
"com.android.server.translation.TranslationManagerService";
private static final String SELECTION_TOOLBAR_MANAGER_SERVICE_CLASS =
"com.android.server.selectiontoolbar.SelectionToolbarManagerService";
private static final String MUSIC_RECOGNITION_MANAGER_SERVICE_CLASS =
"com.android.server.musicrecognition.MusicRecognitionManagerService";
private static final String SYSTEM_CAPTIONS_MANAGER_SERVICE_CLASS =
@@ -2613,11 +2611,6 @@ public final class SystemServer implements Dumpable {
Slog.d(TAG, "TranslationService not defined by OEM");
}
// Selection toolbar service
t.traceBegin("StartSelectionToolbarManagerService");
mSystemServiceManager.startService(SELECTION_TOOLBAR_MANAGER_SERVICE_CLASS);
t.traceEnd();
// NOTE: ClipboardService depends on ContentCapture and Autofill
t.traceBegin("StartClipboardService");
mSystemServiceManager.startService(ClipboardService.class);