Snap for 10453563 from 451ca44026852fe1d6e048644d328830a8ab99bd to mainline-media-swcodec-release
Change-Id: I1631ffc8ed9d8f99aa9dacdf5053d57f93953063
diff --git a/framework/Android.bp b/framework/Android.bp
index 1224d9d..31dee55 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -18,15 +18,13 @@
filegroup {
name: "framework-scheduling-sources",
+ defaults: ["framework-sources-module-defaults"],
srcs: [
"java/**/*.java",
"java/**/*.aidl",
],
path: "java",
- visibility: [
- "//frameworks/base",
- "//packages/modules/Scheduling:__subpackages__",
- ],
+ visibility: ["//packages/modules/Scheduling:__subpackages__"],
}
java_sdk_library {
@@ -40,3 +38,30 @@
],
min_sdk_version: "S",
}
+
+java_api_contribution {
+ name: "framework-scheduling-public-stubs",
+ api_surface: "public",
+ api_file: "api/current.txt",
+ visibility: [
+ "//build/orchestrator/apis",
+ ],
+}
+
+java_api_contribution {
+ name: "framework-scheduling-system-stubs",
+ api_surface: "system",
+ api_file: "api/system-current.txt",
+ visibility: [
+ "//build/orchestrator/apis",
+ ],
+}
+
+java_api_contribution {
+ name: "framework-scheduling-module-lib-stubs",
+ api_surface: "module-lib",
+ api_file: "api/module-lib-current.txt",
+ visibility: [
+ "//build/orchestrator/apis",
+ ],
+}
diff --git a/service/Android.bp b/service/Android.bp
index 6006e8a..3ba2551 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -56,6 +56,7 @@
],
sdk_version: "system_server_current",
libs: [
+ "framework-configinfrastructure",
"framework-scheduling.impl",
"framework-tethering.stubs.module_lib",
"unsupportedappusage",
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;
