diff options
| author | 2025-01-09 10:56:45 -0800 | |
|---|---|---|
| committer | 2025-01-09 10:56:45 -0800 | |
| commit | b43d40d6b85ef6b912a34ccf904ba663e15e16c0 (patch) | |
| tree | eef2fd646886c30f20e88043513ae92a497a812a | |
| parent | 191cd83993ac5e54e44623fed113e8f3bc777f5b (diff) | |
| parent | 53dc0e0fe369705e1b0e073c3789aa1ce0346683 (diff) | |
Merge "[bt] Add the Google module in pixel image" into main
| -rw-r--r-- | boot/Android.bp | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/boot/Android.bp b/boot/Android.bp index 6eead42a4d30..6159845c08f6 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -75,8 +75,8 @@ custom_platform_bootclasspath { module: "art-bootclasspath-fragment", }, { - apex: "com.android.btservices", - module: "com.android.btservices-bootclasspath-fragment", + apex: "com.android.bt", + module: "com.android.bt-bootclasspath-fragment", }, { apex: "com.android.configinfrastructure", diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index c80d6db9399c..d16b94f84e09 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -428,7 +428,7 @@ public final class SystemServer implements Dumpable { "/apex/com.android.uwb/javalib/service-uwb.jar"; private static final String UWB_SERVICE_CLASS = "com.android.server.uwb.UwbService"; private static final String BLUETOOTH_APEX_SERVICE_JAR_PATH = - "/apex/com.android.btservices/javalib/service-bluetooth.jar"; + "/apex/com.android.bt/javalib/service-bluetooth.jar"; private static final String BLUETOOTH_SERVICE_CLASS = "com.android.server.bluetooth.BluetoothService"; private static final String DEVICE_LOCK_SERVICE_CLASS = |