diff options
13 files changed, 135 insertions, 25 deletions
diff --git a/core/jni/OWNERS b/core/jni/OWNERS index 3aca751edb0d..d687ef375bc3 100644 --- a/core/jni/OWNERS +++ b/core/jni/OWNERS @@ -1,6 +1,5 @@ # Camera -per-file *Camera*,*camera* = cychen@google.com, epeev@google.com, etalvala@google.com -per-file *Camera*,*camera* = shuzhenwang@google.com, yinchiayeh@google.com, zhijunhe@google.com +per-file *Camera*,*camera* = file:platform/frameworks/av:/camera/OWNERS # Connectivity per-file android_net_* = codewiz@google.com, jchalard@google.com, lorenzo@google.com, reminv@google.com, satk@google.com diff --git a/media/OWNERS b/media/OWNERS index 2e9276d73392..1e5a458a5bff 100644 --- a/media/OWNERS +++ b/media/OWNERS @@ -4,6 +4,7 @@ elaurent@google.com essick@google.com etalvala@google.com hunga@google.com +jchowdhary@google.com jmtrivi@google.com jsharkey@android.com lajos@google.com diff --git a/services/core/java/com/android/server/am/LmkdStatsReporter.java b/services/core/java/com/android/server/am/LmkdStatsReporter.java index 507fd9efaffd..826629924ab7 100644 --- a/services/core/java/com/android/server/am/LmkdStatsReporter.java +++ b/services/core/java/com/android/server/am/LmkdStatsReporter.java @@ -45,6 +45,7 @@ public final class LmkdStatsReporter { private static final int LOW_MEM_AND_SWAP_UTIL = 6; private static final int LOW_FILECACHE_AFTER_THRASHING = 7; private static final int LOW_MEM = 8; + private static final int DIRECT_RECL_STUCK = 9; /** * Processes the LMK_KILL_OCCURRED packet data @@ -109,6 +110,8 @@ public final class LmkdStatsReporter { return FrameworkStatsLog.LMK_KILL_OCCURRED__REASON__LOW_FILECACHE_AFTER_THRASHING; case LOW_MEM: return FrameworkStatsLog.LMK_KILL_OCCURRED__REASON__LOW_MEM; + case DIRECT_RECL_STUCK: + return FrameworkStatsLog.LMK_KILL_OCCURRED__REASON__DIRECT_RECL_STUCK; default: return FrameworkStatsLog.LMK_KILL_OCCURRED__REASON__UNKNOWN; } diff --git a/services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java b/services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java index 9115f952b724..08155c7b3f98 100644 --- a/services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java +++ b/services/tests/VpnTests/java/com/android/server/connectivity/VpnTest.java @@ -3158,13 +3158,6 @@ public class VpnTest extends VpnTestBase { assertEquals(profile, ikev2VpnProfile.toVpnProfile()); } - private void assertTransportInfoMatches(NetworkCapabilities nc, int type) { - assertNotNull(nc); - VpnTransportInfo ti = (VpnTransportInfo) nc.getTransportInfo(); - assertNotNull(ti); - assertEquals(type, ti.getType()); - } - // Make it public and un-final so as to spy it public class TestDeps extends Vpn.Dependencies { TestDeps() {} diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index fad8115be7e3..c333eb7eed46 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -255,3 +255,89 @@ java_genrule { "done && " + "$(location soong_zip) -o $(out) -C $(genDir)/res -D $(genDir)/res", } + +FLAKY_AND_IGNORED = [ + "androidx.test.filters.FlakyTest", + "org.junit.Ignore", +] +// Used by content protection TEST_MAPPING +test_module_config { + name: "FrameworksServicesTests_contentprotection", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_filters: ["com.android.server.contentprotection"], + exclude_annotations: FLAKY_AND_IGNORED, +} + +test_module_config { + name: "FrameworksServicesTests_om", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_filters: ["com.android.server.om."], + exclude_annotations: FLAKY_AND_IGNORED, +} + +// Used by contexthub TEST_MAPPING +test_module_config { + name: "FrameworksServicesTests_contexthub_presubmit", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_filters: ["com.android.server.location.contexthub."], + // TODO(ron): are these right, does it run anything? + include_annotations: ["android.platform.test.annotations.Presubmit"], + exclude_annotations: FLAKY_AND_IGNORED, +} + +test_module_config { + name: "FrameworksServicesTests_contexthub_postsubmit", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_filters: ["com.android.server.location.contexthub."], + // TODO(ron): are these right, does it run anything? + include_annotations: ["android.platform.test.annotations.Postsubmit"], + exclude_annotations: FLAKY_AND_IGNORED, +} + +// Used by contentcapture +test_module_config { + name: "FrameworksServicesTests_contentcapture", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_filters: ["com.android.server.contentcapture"], + exclude_annotations: FLAKY_AND_IGNORED, +} + +test_module_config { + name: "FrameworksServicesTests_recoverysystem", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_filters: ["com.android.server.recoverysystem."], + exclude_annotations: ["androidx.test.filters.FlakyTest"], +} + +// server pm TEST_MAPPING +test_module_config { + name: "FrameworksServicesTests_pm_presubmit", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_annotations: ["android.platform.test.annotations.Presubmit"], + include_filters: ["com.android.server.pm."], + exclude_annotations: FLAKY_AND_IGNORED, +} + +test_module_config { + name: "FrameworksServicesTests_pm_postsubmit", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_annotations: ["android.platform.test.annotations.Postsubmit"], + include_filters: ["com.android.server.pm."], + exclude_annotations: FLAKY_AND_IGNORED, +} + +// server os TEST_MAPPING +test_module_config { + name: "FrameworksServicesTests_os", + base: "FrameworksServicesTests", + test_suites: ["general-tests"], + include_filters: ["com.android.server.os."], +} diff --git a/services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING index 0ffa891ce3e1..dae8f932cb91 100644 --- a/services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/contentcapture/TEST_MAPPING @@ -14,5 +14,11 @@ } ] } + ], + "postsubmit": [ + { + // b/331020193, Move to presubmit early april 2024 + "name": "FrameworksServicesTests_contentcapture" + } ] } diff --git a/services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING index 419508ca5e17..32729a899a96 100644 --- a/services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/contentprotection/TEST_MAPPING @@ -14,5 +14,11 @@ } ] } + ], + "postsubmit": [ + { + // b/331020193, Move to presubmit early april 2024 + "name": "FrameworksServicesTests_contentprotection" + } ] } diff --git a/services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING index 6035250500ec..dc8f934ff9e5 100644 --- a/services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/location/contexthub/TEST_MAPPING @@ -20,12 +20,18 @@ ], "postsubmit": [ { + // b/331020193, Move to presubmit early april 2024 + "name": "FrameworksServicesTests_contexthub_presubmit" + }, + { "name": "FrameworksServicesTests", "options": [ { "include-filter": "com.android.server.location.contexthub." }, { + // I believe this include annotation is preventing tests from being run + // as there are no matching tests with the Postsubmit annotation. "include-annotation": "android.platform.test.annotations.Postsubmit" }, { diff --git a/services/tests/servicestests/src/com/android/server/om/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/om/TEST_MAPPING index 558e2591161c..41c4383a0bec 100644 --- a/services/tests/servicestests/src/com/android/server/om/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/om/TEST_MAPPING @@ -16,5 +16,11 @@ } ] } + ], + "postsubmit": [ + { + // b/331020193, Move to presubmit early april 2024 + "name": "FrameworksServicesTests_om" + } ] } diff --git a/services/tests/servicestests/src/com/android/server/os/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/os/TEST_MAPPING index 5a46f8c4beea..06e7002924a7 100644 --- a/services/tests/servicestests/src/com/android/server/os/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/os/TEST_MAPPING @@ -8,5 +8,11 @@ } ] } + ], + "postsubmit": [ + { + // b/331020193, Move to presubmit early april 2024 + "name": "FrameworksServicesTests_os" + } ] } diff --git a/services/tests/servicestests/src/com/android/server/pm/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/pm/TEST_MAPPING index 85a73bb22009..f4e724f493c5 100644 --- a/services/tests/servicestests/src/com/android/server/pm/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/pm/TEST_MAPPING @@ -20,21 +20,13 @@ ], "postsubmit": [ { - "name": "FrameworksServicesTests", - "options": [ - { - "include-filter": "com.android.server.pm." - }, - { - "include-annotation": "android.platform.test.annotations.Postsubmit" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "org.junit.Ignore" - } - ] + // Presubmit is intentional here while testing with SLO checker. + // b/331020193, Move to presubmit early april 2024 + "name": "FrameworksServicesTests_pm_presubmit" + }, + { + // Leave postsubmit here when migrating + "name": "FrameworksServicesTests_pm_postsubmit" } ] } diff --git a/services/tests/servicestests/src/com/android/server/recoverysystem/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/recoverysystem/TEST_MAPPING index e9d8b2e709e7..7e7393c3a822 100644 --- a/services/tests/servicestests/src/com/android/server/recoverysystem/TEST_MAPPING +++ b/services/tests/servicestests/src/com/android/server/recoverysystem/TEST_MAPPING @@ -11,5 +11,11 @@ } ] } + ], + "postsubmit": [ + { + // b/331020193, Move to presubmit early april 2024 + "name": "FrameworksServicesTests_recoverysystem" + } ] }
\ No newline at end of file diff --git a/services/usage/java/com/android/server/usage/BroadcastResponseStatsTracker.java b/services/usage/java/com/android/server/usage/BroadcastResponseStatsTracker.java index d9cbea95e563..ed89190f8473 100644 --- a/services/usage/java/com/android/server/usage/BroadcastResponseStatsTracker.java +++ b/services/usage/java/com/android/server/usage/BroadcastResponseStatsTracker.java @@ -181,7 +181,7 @@ class BroadcastResponseStatsTracker { // We only need to look at the broadcast events that occurred before // this notification related event. while (dispatchTimestampsMs.size() > 0 - && dispatchTimestampsMs.peekFirst() < timestampMs) { + && dispatchTimestampsMs.peekFirst() <= timestampMs) { final long dispatchTimestampMs = dispatchTimestampsMs.peekFirst(); final long elapsedDurationMs = timestampMs - dispatchTimestampMs; // Only increment the counts if the broadcast was sent not too long ago, as |