commit 4d01eeaffaa720e4458a118baa137a11614f00f7
author Justin Klaassen <justinklaassen@google.com> Tue Apr 03 23:21:57 2018 -0400
committer Justin Klaassen <justinklaassen@google.com> Tue Apr 03 23:21:57 2018 -0400
tree 66751893566986236788e3c796a7cc5e90d05f52
parent a192cc2a132cb0ee8588e2df755563ec7008c179

Import Android SDK Platform P [4697573]

/google/data/ro/projects/android/fetch_artifact \
    --bid 4697573 \
    --target sdk_phone_armv7-win_sdk \
    sdk-repo-linux-sources-4697573.zip

AndroidVersion.ApiLevel has been modified to appear as 28

Change-Id: If80578c3c657366cc9cf75f8db13d46e2dd4e077

java/io/ObjectStreamField.java

diff --git a/java/io/ObjectStreamField.java b/java/io/ObjectStreamField.java
index c49bcac..957972e 100644
--- a/java/io/ObjectStreamField.java
+++ b/java/io/ObjectStreamField.java
@@ -29,7 +29,6 @@
 import sun.reflect.CallerSensitive;
 import sun.reflect.Reflection;
 import sun.reflect.misc.ReflectUtil;
-import dalvik.system.VMStack;
 
 /**
  * A description of a Serializable field from a Serializable class.  An array
@@ -163,6 +162,14 @@
      */
     @CallerSensitive
     public Class<?> getType() {
+        /* BEGIN Android-removed: Security manager is always null on Android.
+        if (System.getSecurityManager() != null) {
+             Class<?> caller = Reflection.getCallerClass();
+            if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) {
+                ReflectUtil.checkPackageAccess(type);
+            }
+        }
+        END Android-removed: Security manager is always null on Android. */
         return type;
     }