commit 29885b3e215d1022c130abffbfc337a79833e20a
author Vladimir Marko <vmarko@google.com> Wed Apr 03 10:09:26 2019 +0100
committer Vladimir Marko <vmarko@google.com> Wed Apr 03 12:22:54 2019 +0000
tree 6a3fb03d78837afd72bc74a926f3f7e2322f8deb
parent 7126c5b47d34b9a4d6d7553b8ea48e5085ee6b41

Hide updatable-media package classes for app AOT compilation.

Test: m
Bug: 122937705
Change-Id: I1b26d23b6b5e0132c6893ac2901d3b56d0638027

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index db79128..6fdac3f 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3011,9 +3011,12 @@
 
 static bool IsReservedBootClassPathDescriptor(const char* descriptor) {
   std::string_view descriptor_sv(descriptor);
-  // Reserved conscrypt packages (includes sub-packages under these paths).
-  return StartsWith(descriptor_sv, "Landroid/net/ssl/") ||
-         StartsWith(descriptor_sv, "Lcom/android/org/conscrypt/");
+  return
+      // Reserved conscrypt packages (includes sub-packages under these paths).
+      StartsWith(descriptor_sv, "Landroid/net/ssl/") ||
+      StartsWith(descriptor_sv, "Lcom/android/org/conscrypt/") ||
+      // Reserved updatable-media package (includes sub-packages under this path).
+      StartsWith(descriptor_sv, "Landroid/media/");
 }
 
 ObjPtr<mirror::Class> ClassLinker::DefineClass(Thread* self,