summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libart/src/main/java/dalvik/system/VMRuntime.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index 0f2f75dc60..a97d7fc48a 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -16,8 +16,12 @@
package dalvik.system;
+import android.compat.annotation.ChangeId;
+import android.compat.annotation.EnabledAfter;
import android.compat.annotation.UnsupportedAppUsage;
+import dalvik.annotation.compat.VersionCodes;
+
import java.lang.ref.FinalizerReference;
import java.util.HashMap;
import java.util.Map;
@@ -59,6 +63,16 @@ public final class VMRuntime {
}
/**
+ * Remove meta-reflection workaround for hidden api usage for apps targeting R+. This allowed
+ * apps to obtain references to blacklisted fields and methods through an extra layer of
+ * reflection.
+ */
+ @ChangeId
+ @EnabledAfter(targetSdkVersion = VersionCodes.Q)
+ private static final long
+ PREVENT_META_REFLECTION_BLACKLIST_ACCESS = 142365358; // This is a bug id.
+
+ /**
* Interface for logging hidden API usage events.
*/
@libcore.api.CorePlatformApi