summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Brazdil <dbrazdil@google.com> 2019-02-18 11:29:01 -0800
committer android-build-merger <android-build-merger@google.com> 2019-02-18 11:29:01 -0800
commitaf4651f75f9454ca0d1dfce28fa2ad9727359239 (patch)
tree8a3a0086c613c4989d771bee3830dcf6f72ca1a1
parent95a9dc906f4dd66ebf7530a5597ed817e7ff0e13 (diff)
parent20a71e4a90ba6db74a0336e84ac5e5fb3cbcea06 (diff)
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()" am: da75e38817
am: 20a71e4a90 Change-Id: I07d5ec63ffcf5bda0a2cb3c2d4b0d3af0d3fdbf3
-rw-r--r--config/hiddenapi-force-blacklist.txt2
-rw-r--r--config/hiddenapi-greylist-max-o.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/config/hiddenapi-force-blacklist.txt b/config/hiddenapi-force-blacklist.txt
index dca3b525c06a..b328f2ac1955 100644
--- a/config/hiddenapi-force-blacklist.txt
+++ b/config/hiddenapi-force-blacklist.txt
@@ -1,4 +1,6 @@
Ldalvik/system/VMRuntime;->setHiddenApiExemptions([Ljava/lang/String;)V
+Ldalvik/system/VMRuntime;->setTargetSdkVersion(I)V
+Ldalvik/system/VMRuntime;->setTargetSdkVersionNative(I)V
Ljava/lang/invoke/MethodHandles$Lookup;->IMPL_LOOKUP:Ljava/lang/invoke/MethodHandles$Lookup;
Ljava/lang/invoke/VarHandle;->acquireFence()V
Ljava/lang/invoke/VarHandle;->compareAndExchange([Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/config/hiddenapi-greylist-max-o.txt b/config/hiddenapi-greylist-max-o.txt
index 4b6cc0ef7795..d9c1cd0313fc 100644
--- a/config/hiddenapi-greylist-max-o.txt
+++ b/config/hiddenapi-greylist-max-o.txt
@@ -109777,7 +109777,6 @@ Ldalvik/system/VMRuntime;->setHiddenApiAccessLogSamplingRate(I)V
Ldalvik/system/VMRuntime;->setNonSdkApiUsageConsumer(Ljava/util/function/Consumer;)V
Ldalvik/system/VMRuntime;->setProcessPackageName(Ljava/lang/String;)V
Ldalvik/system/VMRuntime;->setSystemDaemonThreadPriority()V
-Ldalvik/system/VMRuntime;->setTargetSdkVersionNative(I)V
Ldalvik/system/VMRuntime;->startHeapTaskProcessor()V
Ldalvik/system/VMRuntime;->startJitCompilation()V
Ldalvik/system/VMRuntime;->stopHeapTaskProcessor()V