vanilla: RQ2A.210505 -> RQ3A.210605

Author: danielfullmer

flavors/vanilla/default.nix

@@ -137,18 +137,10 @@ in mkIf (config.flavor == "vanilla") (mkMerge [
 ### Android 11 stuff ###
 (mkIf (config.androidVersion == 11) (mkMerge [
 {
-  buildDateTime = mkDefault 1620097209;
-
-  source.manifest.rev = mkDefault (
-    if lib.elem config.deviceFamily [ "crosshatch" "bonito" "coral" "sunfish" ]
-    then "android-11.0.0_r36"
-    else "android-11.0.0_r37"
-  );
-  apv.buildID = mkDefault (
-    if lib.elem config.deviceFamily [ "crosshatch" "bonito" "coral" "sunfish" ]
-    then "RQ2A.210505.002"
-    else "RQ2A.210505.003"
-  );
+  buildDateTime = mkDefault 1623109908;
+
+  source.manifest.rev = mkDefault "android-11.0.0_r38";
+  apv.buildID = mkDefault "RQ3A.210605.005";
 
   # See also: https://github.com/GrapheneOS/os_issue_tracker/issues/325
   # List of biometric sensors on the device, in decreasing strength. Consumed by AuthService

flavors/vanilla/kernel-metadata.json

@@ -5,22 +5,22 @@
     },
     "crosshatch": {
         "branch": "android-msm-crosshatch-4.9-android11-qpr2",
-        "tag": "android-11.0.0_r0.77"
+        "tag": "android-11.0.0_r0.82"
     },
     "bonito": {
         "branch": "android-msm-bonito-4.9-android11-qpr2",
-        "tag": "android-11.0.0_r0.78"
+        "tag": "android-11.0.0_r0.83"
     },
     "coral": {
         "branch": "android-msm-coral-4.14-android11-qpr2",
-        "tag": "android-11.0.0_r0.79"
+        "tag": "android-11.0.0_r0.84"
     },
     "sunfish": {
         "branch": "android-msm-sunfish-4.14-android11-qpr2",
-        "tag": "android-11.0.0_r0.80"
+        "tag": "android-11.0.0_r0.85"
     },
     "redfin": {
         "branch": "android-msm-redbull-4.19-android11-qpr2",
-        "tag": "android-11.0.0_r0.81"
+        "tag": "android-11.0.0_r0.86"
     }
 }