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

Merge "RESTRICT AUTOMERGE: Revert "Register ART Service with the System Server"" into sc-dev

Browse Source
This commit is contained in:
Christian Wailes
2021-05-24 22:38:59 +00:00
committed by Android (Google) Code Review
parent a376aeb68f 4ac971346d
commit 4a99888888
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/Android.bp
View File

@@ -141,7 +141,6 @@ java_library {
libs: [ libs: [
"android.hidl.manager-V1.0-java", "android.hidl.manager-V1.0-java",
"framework-tethering.stubs.module_lib", "framework-tethering.stubs.module_lib",
"service-art.stubs.system_server",
], ],
// Uncomment to enable output of certain warnings (deprecated, unchecked) // Uncomment to enable output of certain warnings (deprecated, unchecked)

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

@@ -103,7 +103,6 @@ import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.widget.ILockSettings; import com.android.internal.widget.ILockSettings;
import com.android.server.am.ActivityManagerService; import com.android.server.am.ActivityManagerService;
import com.android.server.appbinding.AppBindingService; import com.android.server.appbinding.AppBindingService;
import com.android.server.art.ArtManagerLocal;
import com.android.server.attention.AttentionManagerService; import com.android.server.attention.AttentionManagerService;
import com.android.server.audio.AudioService; import com.android.server.audio.AudioService;
import com.android.server.biometrics.AuthService; import com.android.server.biometrics.AuthService;
@@ -2632,10 +2631,6 @@ public final class SystemServer implements Dumpable {
mSystemServiceManager.startService(GAME_MANAGER_SERVICE_CLASS); mSystemServiceManager.startService(GAME_MANAGER_SERVICE_CLASS);
t.traceEnd(); t.traceEnd();
t.traceBegin("ArtManagerLocal");
LocalManagerRegistry.addManager(ArtManagerLocal.class, new ArtManagerLocal());
t.traceEnd();
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)) { if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)) {
t.traceBegin("UwbService"); t.traceBegin("UwbService");
mSystemServiceManager.startService(UWB_SERVICE_CLASS); mSystemServiceManager.startService(UWB_SERVICE_CLASS);