DO NOT MERGE: Revert "Allow mocks to call blackisted APIs"

This reverts commit 5529c6ea5fd4cb3959f11c9b4b114361a3db2f73.

Bug: b/80041014

Change-Id: I01752919321eb5f7bfca8b069c3b13edb5d6ce95

1 files changed, 0 insertions, 14 deletions

diff --git a/dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java b/dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java
index 053fb16..1363894 100644
--- a/dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java
+++ b/dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java
@@ -47,8 +47,6 @@ import static java.lang.reflect.Modifier.PRIVATE;
 import static java.lang.reflect.Modifier.PUBLIC;
 import static java.lang.reflect.Modifier.STATIC;
 
-import android.os.Build;
-
 /**
  * Creates dynamic proxies of concrete classes.
  * <p>
@@ -303,18 +301,6 @@ public final class ProxyBuilder<T> {
         if (sharedClassLoader) {
             dexMaker.setSharedClassLoader(baseClass.getClassLoader());
         }
-        if (Build.VERSION.SDK_INT >= 28) {
-            // The proxied class might have blacklisted methods. Blacklisting methods (and fields)
-            // is a new feature of Android P:
-            //
-            // https://android-developers.googleblog.com/2018/02/
-            // improving-stability-by-reducing-usage.html
-            //
-            // The newly generated class might not be allowed to call methods of the proxied class
-            // if it is not trusted. As it is not clear which classes have blacklisted methods, mark
-            // all generated classes as trusted.
-            dexMaker.markAsTrusted();
-        }
         ClassLoader classLoader = dexMaker.generateAndLoad(parentClassLoader, dexCache);
         try {
             proxyClass = loadClass(classLoader, generatedName);