[automerger skipped] RESTRICT AUTOMERGE Do not run RebootReadinessManagerTest on watch form factors am: f69f8e0598 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Scheduling/+/2663015
Change-Id: I83eccf007baba511b15fbde9327d3459d62adb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/apex/Android.bp b/apex/Android.bp
index d425260..dcacec9 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -88,6 +88,9 @@
sdk {
name: "scheduling-sdk",
- bootclasspath_fragments: ["com.android.scheduling-bootclasspath-fragment"],
- systemserverclasspath_fragments: ["com.android.scheduling-systemserverclasspath-fragment"],
+ apexes: [
+ // Adds exportable dependencies of the APEX to the sdk,
+ // e.g. *classpath_fragments.
+ "com.android.scheduling",
+ ],
}
diff --git a/apex/manifest.json b/apex/manifest.json
index ccf4ddd..6aa566e 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,7 @@
{
"name": "com.android.scheduling",
- "version": 339990000
+
+ // Placeholder module version to be replaced during build.
+ // Do not change!
+ "version": 0
}
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 ef0610c..3ba2551 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -47,20 +47,23 @@
name: "service-scheduling",
srcs: [
":service-scheduling-sources",
- // TODO(b/161353402): Remove framework dependency when modules-utils expands
- ":framework-cellbroadcast-shared-srcs",
":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",
"framework-scheduling.impl",
"framework-tethering.stubs.module_lib",
"unsupportedappusage",
],
static_libs: [
"modules-utils-handlerexecutor",
+ "modules-utils-locallog",
"modules-utils-shell-command-handler",
"scheduling-statsd",
],
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;
diff --git a/tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java b/tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java
index c456bde..31c233a 100644
--- a/tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java
+++ b/tests/src/com/android/cts/scheduling/RebootReadinessManagerTest.java
@@ -19,14 +19,12 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
import android.Manifest;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageManager;
import android.os.HandlerExecutor;
import android.os.HandlerThread;
import android.provider.DeviceConfig;
@@ -38,7 +36,6 @@
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -109,19 +106,11 @@
Thread.sleep(1000);
}
- @Before
- public void setUp() {
- assumeFalse(InstrumentationRegistry.getContext().getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_WATCH));
- }
-
@After
public void tearDown() {
- if (mRebootReadinessManager != null) {
- mRebootReadinessManager.removeRequestRebootReadinessStatusListener(READY_CALLBACK);
- mRebootReadinessManager.removeRequestRebootReadinessStatusListener(BLOCKING_CALLBACK);
- mRebootReadinessManager.cancelPendingReboot();
- }
+ mRebootReadinessManager.removeRequestRebootReadinessStatusListener(READY_CALLBACK);
+ mRebootReadinessManager.removeRequestRebootReadinessStatusListener(BLOCKING_CALLBACK);
+ mRebootReadinessManager.cancelPendingReboot();
}
@AfterClass
