Test that ptrace is disabled on both userdebug and user
The default for ptrace debugging is going back to disabled on userdebug
builds, make CtsMemunreachableTestCases use the same test for undebuggable
apps on user and userdebug.
Bug: 292818059
Test: CtsMemunreachableTestCases
Change-Id: I3b498afcf678318905ef6c6d190bda90c6806faa
diff --git a/hostsidetests/memunreachable/src/android/memunreachable/cts/MemunreachableTests.kt b/hostsidetests/memunreachable/src/android/memunreachable/cts/MemunreachableTests.kt
index b96a5cf..6c70ab3 100644
--- a/hostsidetests/memunreachable/src/android/memunreachable/cts/MemunreachableTests.kt
+++ b/hostsidetests/memunreachable/src/android/memunreachable/cts/MemunreachableTests.kt
@@ -48,18 +48,12 @@
@Test
@Throws(DeviceNotAvailableException::class)
fun testDumpsysMeminfoUnreachableUndebuggableApp() {
- // Test that an app not marked android:debuggable can have dumpsys meminfo --unreachable run on it
- // on a userdebug build but not on a user build.
+ // Test that an app not marked android:debuggable can not have dumpsys meminfo --unreachable run on it.
val meminfo = dumpsysMemunreachable(UNDEBUGGABLE_TEST_PACKAGE, TEST_ACTIVITY)
Truth.assertThat(meminfo).isNotNull()
Truth.assertThat(meminfo).startsWith("Unreachable memory\n")
- if (device.getProperty("ro.build.type") == "user") {
- Truth.assertWithMessage("on a user build").that(meminfo)
- .doesNotContainMatch(UNREACHABLE_MEMORY_RESULT_PATTERN.toPattern())
- } else {
- Truth.assertWithMessage("on userdebug or eng build").that(meminfo)
- .containsMatch(UNREACHABLE_MEMORY_RESULT_PATTERN.toPattern())
- }
+ Truth.assertThat(meminfo)
+ .doesNotContainMatch(UNREACHABLE_MEMORY_RESULT_PATTERN.toPattern())
}
companion object {
