From 9228d2f1e87e2437ee463f037421f6b56c92bc53 Mon Sep 17 00:00:00 2001 From: Alessandra Loro Date: Tue, 6 Dec 2022 09:54:44 +0000 Subject: [PATCH] Revert "Expose ro.secure test endpoint for cts." This reverts commit 045c55c4b3fd6a9cb6b06b7bb00e1a6a40798ab3. Reason for revert: As of ag/20645656 , this endpoint is not needed anymore. The affected CTS tests were moved to host tests in aosp/2319610 Bug: 260183784 Change-Id: I0f53177d2134da809efe1acae86a7203379c4bdb --- core/api/test-current.txt | 1 - core/java/android/os/Build.java | 22 ---------------------- 2 files changed, 23 deletions(-) diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ae5a5ee88d98f..f0763950ba378 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1711,7 +1711,6 @@ package android.os { public class Build { method public static boolean is64BitAbi(String); method public static boolean isDebuggable(); - method public static boolean isSecure(); field public static final boolean IS_EMULATOR; } diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 44a1fa51e9bfb..249f48608d404 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1446,28 +1446,6 @@ public class Build { return IS_DEBUGGABLE; } - - /** - * Returns true if the device is running a secure build, such as "user" or "userdebug". - * - * Secure builds drop adbd privileges by default, though debuggable builds still allow users - * to gain root access via local shell. See should_drop_privileges() in adb for details. - * @hide - */ - private static final boolean IS_SECURE = - SystemProperties.getBoolean("ro.secure", true); - /** - * Returns true if the device is running a secure build, such as "user" or "userdebug". - * - * Secure builds drop adbd privileges by default, though debuggable builds still allow users - * to gain root access via local shell. See should_drop_privileges() in adb for details. - * @hide - */ - @TestApi - public static boolean isSecure() { - return IS_SECURE; - } - /** {@hide} */ public static final boolean IS_ENG = "eng".equals(TYPE); /** {@hide} */