Merge Android 14
Bug: 298295554
Merged-In: If7e16a46e752185468b01f44b888d9b2f2236fdb
Change-Id: I938d899b108e6972e1d01927e59eb6077c1f3b82
diff --git a/service/Android.bp b/service/Android.bp
index 5cd01f8..3ba2551 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -50,7 +50,10 @@
":reboot-stats-parser",
],
min_sdk_version: "31",
- defaults: ["framework-system-server-module-defaults" ],
+ defaults: [
+ "framework-system-server-module-defaults",
+ "standalone-system-server-module-optimize-defaults",
+ ],
sdk_version: "system_server_current",
libs: [
"framework-configinfrastructure",
diff --git a/tests/hostsidetests/src/com/android/tests/scheduling/host/RebootReadinessHostTest.java b/tests/hostsidetests/src/com/android/tests/scheduling/host/RebootReadinessHostTest.java
index 69ddbf5..d2a1ee6 100644
--- a/tests/hostsidetests/src/com/android/tests/scheduling/host/RebootReadinessHostTest.java
+++ b/tests/hostsidetests/src/com/android/tests/scheduling/host/RebootReadinessHostTest.java
@@ -20,6 +20,7 @@
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+import com.android.tradefed.util.RunUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -60,7 +61,7 @@
getDevice().executeShellCommand("wm dismiss-keyguard");
// Wait a small amount of time for the metrics to be logged, before querying logcat
- Thread.sleep(2000);
+ RunUtil.getDefault().sleep(2000);
String logs = getDevice().executeAdbCommand(
"logcat", "-v", "brief", "-d", "RebootReadinessLogger:I", "*:S");
UnattendedRebootMetricEvent event = null;
