Snap for 6420265 from 05ca36346eac5a5cc25ae909e1c6a3a51a58965a to rvc-release

Change-Id: Ifbe2e70e55b5b34ec480a29b50378a1879f8b325

1 files changed, 21 insertions, 0 deletions

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowParcel.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowParcel.java
index dcb9719b3..e358fc19b 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowParcel.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowParcel.java
@@ -7,6 +7,7 @@ import static android.os.Build.VERSION_CODES.LOLLIPOP;
 import static android.os.Build.VERSION_CODES.M;
 import static android.os.Build.VERSION_CODES.O_MR1;
 import static android.os.Build.VERSION_CODES.P;
+import static android.os.Build.VERSION_CODES.R;
 import static org.robolectric.RuntimeEnvironment.castNativePtr;
 
 import android.os.BadParcelableException;
@@ -311,6 +312,16 @@ public class ShadowParcel {
     NATIVE_PTR_TO_PARCEL.get(nativePtr).writeString(val);
   }
 
+  @Implementation(minSdk = R)
+  protected static void nativeWriteString8(long nativePtr, String val) {
+    nativeWriteString(nativePtr, val);
+  }
+
+  @Implementation(minSdk = R)
+  protected static void nativeWriteString16(long nativePtr, String val) {
+    nativeWriteString(nativePtr, val);
+  }
+
   @HiddenApi
   @Implementation(maxSdk = KITKAT_WATCH)
   protected static void nativeWriteStrongBinder(int nativePtr, IBinder val) {
@@ -399,6 +410,16 @@ public class ShadowParcel {
     return NATIVE_PTR_TO_PARCEL.get(nativePtr).readString();
   }
 
+  @Implementation(minSdk = R)
+  protected static String nativeReadString8(long nativePtr) {
+    return nativeReadString(nativePtr);
+  }
+
+  @Implementation(minSdk = R)
+  protected static String nativeReadString16(long nativePtr) {
+    return nativeReadString(nativePtr);
+  }
+
   @HiddenApi
   @Implementation(maxSdk = KITKAT_WATCH)
   protected static IBinder nativeReadStrongBinder(int nativePtr) {