From d2744bca566beedbb88d6a1d70d50f66b94a0541 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Tue, 17 Mar 2020 12:34:55 +0000 Subject: [PATCH] Put com.android.location.provider before services on the system server classpath. Test: aosp_walleye-userdebug boots and there are no messages in the logcat regarding class loader context mismatch: $ adb logcat | grep 'mismatch' # empty Bug: 147017252 Change-Id: I338685b9cf71681b5ca0c541752948934b656b46 Merged-In: I338685b9cf71681b5ca0c541752948934b656b46 (cherry picked from commit db088602f5e6bcdc7f2475493c2d70a92992ce5e) --- target/product/media_system.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/media_system.mk b/target/product/media_system.mk index 5749ed5db..a83e609f3 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -50,10 +50,10 @@ endif # The order here is the same order they end up on the classpath, so it matters. PRODUCT_SYSTEM_SERVER_JARS := \ + com.android.location.provider \ services \ ethernet-service \ wifi-service \ - com.android.location.provider \ # system server jars which are updated via apex modules. # The values should be of the format :