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

DO NOT MERGE Move LMS to ease merge conflicts

Browse Source 
Cherrypick change from master moving LMS, so that merge conflicts will
be easier to resolve.

Bug: 153568386
Test: presubmits
Change-Id: I8eba22622cc5f4d11c1a928b6cf3883cbf96caba
This commit is contained in:
Soonil Nagarkar
2020-04-14 12:01:21 -07:00
parent 42987638f5
commit 1716a62ac1
8 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,6 +112,7 @@ import com.android.server.inputmethod.InputMethodSystemProperty;
import com.android.server.inputmethod.MultiClientInputMethodManagerService;
import com.android.server.integrity.AppIntegrityManagerService;
import com.android.server.lights.LightsService;
import com.android.server.location.LocationManagerService;
import com.android.server.media.MediaResourceMonitorService;
import com.android.server.media.MediaRouterService;
import com.android.server.media.MediaSessionService;