8 files changed, 21 insertions, 1 deletions
diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc
index 902c3b84b5..67ea64be74 100644
--- a/runtime/well_known_classes.cc
+++ b/runtime/well_known_classes.cc
@@ -283,7 +283,27 @@ uint32_t WellKnownClasses::StringInitToEntryPoint(ArtMethod* string_init) {
 }
 #undef STRING_INIT_LIST
 
+class ScopedHiddenApiExemption {
+ public:
+  explicit ScopedHiddenApiExemption(Runtime* runtime)
+      : runtime_(runtime),
+        initially_enabled_(runtime_->AreHiddenApiChecksEnabled()) {
+    runtime_->SetHiddenApiChecksEnabled(false);
+  }
+
+  ~ScopedHiddenApiExemption() {
+    runtime_->SetHiddenApiChecksEnabled(initially_enabled_);
+  }
+
+ private:
+  Runtime* runtime_;
+  const bool initially_enabled_;
+  DISALLOW_COPY_AND_ASSIGN(ScopedHiddenApiExemption);
+};
+
 void WellKnownClasses::Init(JNIEnv* env) {
+  ScopedHiddenApiExemption hiddenapi_exemption(Runtime::Current());
+
   dalvik_annotation_optimization_CriticalNative =
       CacheClass(env, "dalvik/annotation/optimization/CriticalNative");
   dalvik_annotation_optimization_FastNative = CacheClass(env, "dalvik/annotation/optimization/FastNative");
diff --git a/test/988-TooDeepClassInstanceOf/expected.txt b/test/805-TooDeepClassInstanceOf/expected.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/988-TooDeepClassInstanceOf/expected.txt
+++ b/test/805-TooDeepClassInstanceOf/expected.txt
diff --git a/test/988-TooDeepClassInstanceOf/info.txt b/test/805-TooDeepClassInstanceOf/info.txt
index 390b00d122..390b00d122 100644
--- a/test/988-TooDeepClassInstanceOf/info.txt
+++ b/test/805-TooDeepClassInstanceOf/info.txt
diff --git a/test/988-TooDeepClassInstanceOf/src/Main.java b/test/805-TooDeepClassInstanceOf/src/Main.java
index 93a41e565b..93a41e565b 100644
--- a/test/988-TooDeepClassInstanceOf/src/Main.java
+++ b/test/805-TooDeepClassInstanceOf/src/Main.java
diff --git a/test/988-TooWideClassInstanceOf/expected.txt b/test/806-TooWideClassInstanceOf/expected.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/988-TooWideClassInstanceOf/expected.txt
+++ b/test/806-TooWideClassInstanceOf/expected.txt
diff --git a/test/988-TooWideClassInstanceOf/info.txt b/test/806-TooWideClassInstanceOf/info.txt
index 30546fe076..30546fe076 100644
--- a/test/988-TooWideClassInstanceOf/info.txt
+++ b/test/806-TooWideClassInstanceOf/info.txt
diff --git a/test/988-TooWideClassInstanceOf/src/Main.java b/test/806-TooWideClassInstanceOf/src/Main.java
index 332569c104..332569c104 100644
--- a/test/988-TooWideClassInstanceOf/src/Main.java
+++ b/test/806-TooWideClassInstanceOf/src/Main.java
diff --git a/test/993-breakpoints/src/art/Breakpoint.java b/test/993-breakpoints/src/art/Breakpoint.java
index 2a370ebd40..bbb89f707f 100644
--- a/test/993-breakpoints/src/art/Breakpoint.java
+++ b/test/993-breakpoints/src/art/Breakpoint.java
@@ -117,7 +117,7 @@ public class Breakpoint {
                                                  Thread thr);
   public static native void stopBreakpointWatch(Thread thr);
 
-  public static final class LineNumber {
+  public static final class LineNumber implements Comparable<LineNumber> {
     public final long location;
     public final int line;