Fix tests disrupted by re-modelling and stubbing Android 9:

* Account for changed dataflow graph shape using external flow
* Account for BaseBundle only existing as of Android 5
* Properly implement Parcelable, which we previously got away with due to a partial stub
* Restore an Android 11 function that had been added to the Android 9 Context class (I won't get into enforcing the difference in this PR)

Author: smowton

java/ql/lib/semmle/code/java/frameworks/android/Android.qll

@@ -221,10 +221,12 @@ class CreateFromParcelMethod extends Method {
 
 private class TaintPropagationModels extends SummaryModelCsv {
   override predicate row(string s) {
-    // BaseBundle getters
+    // BaseBundle getters. These are also modelled on Bundle because BaseBundle was factored out of Bundle
+    // in Android 5.0; before that these methods were declared directly on Bundle.
     s =
-      "android.os;BaseBundle;true;get" + ["Boolean", "Double", "Int", "Long", "String"] +
-        ["", "Array"] + ";;;Argument[-1];ReturnValue;taint"
+      "android.os;" + ["BaseBundle", "Bundle"] + ";true;get" +
+        ["Boolean", "Double", "Int", "Long", "String"] + ["", "Array"] +
+        ";;;Argument[-1];ReturnValue;taint"
     or
     // Bundle getters
     s =

java/ql/test/query-tests/security/CWE-502/ParcelableEntity.java

@@ -21,6 +21,9 @@ public void writeToParcel(Parcel parcel, int i) {
         parcel.writeString(GSON.toJson(obj));
     }
 
+    @Override
+    public int describeContents() { return 0; }
+
     public static final Parcelable.Creator CREATOR = new Creator<ParcelableEntity>() {
         @Override
         public ParcelableEntity createFromParcel(Parcel parcel) {