April security patches

Author: gothicVI

laos_build.sh

@@ -183,6 +183,8 @@ function pick_unmerged_commits {
         repopick -f -t n-asb-2025-02 || exit 1
         #2025-03-05
         repopick -f -t n-asb-2025-03 || exit 1
+        #2025-04-05
+        repopick -f -t n-asb-2025-04 || exit 1
         #tzdb_N
         repopick -f -t tzdb_N || exit 1
         echo
@@ -279,6 +281,8 @@ function pick_unmerged_commits {
         repopick -f -t P_asb_2025-02 || exit 1
         #2025-03-05
         repopick -f -t P_asb_2025-03 || exit 1
+        #2025-04-05
+        repopick -f -t P_asb_2025-04 || exit 1
         echo
     fi
     if [ "${rev}" == "17.1" ]; then
@@ -364,6 +368,8 @@ function pick_unmerged_commits {
         cp -v ./android/default.xml ./.repo/manifests || exit 1
         repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast external/dng_sdk 2>&1 || exit 1
         repopick -t Q_asb_2025-03 || exit 1
+        #2025-04-05
+        repopick -t Q_asb_2025-04 || exit 1
         echo
     fi
     if [ "${rev}" == "18.1" ]; then
@@ -409,6 +415,8 @@ function pick_unmerged_commits {
         cp -v ./android/default.xml ./.repo/manifests/ || exit 1
         repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
         repopick -t R_asb_2025-03 || exit 1
+        #2025-04-05
+        repopick -t R_asb_2025-04 || exit 1
         echo
     fi
     if [ "${rev}" == "19.1" ]; then
@@ -418,24 +426,37 @@ function pick_unmerged_commits {
         cp -v ./android/default.xml ./.repo/manifests/ || exit 1
         repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
         repopick -t S_asb_2025-03 || exit 1
+        #2025-04-05
+        repopick -t S_asb_2025-04 || exit 1
         echo
     fi
     if [ "${rev}" == "20.0" ]; then
         echo
-        #2025-03-05
-        repopick -f 421011 || exit 1
+        #2025-04-05
+        repopick -f 428045 || exit 1
         cp -v ./android/default.xml ./.repo/manifests/ || exit 1
-        repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
-        repopick -p -t T_asb_2025-03 || exit 1
+        repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 packages/modules/IntentResolver || exit 1
+        repopick -p -t T_asb_2025-04 || exit 1
         echo
     fi
     if [ "${rev}" == "21.0" ]; then
         echo
-        #2025-03-05
-        repopick -f 420932 || exit 1
-        cp -v ./android/default.xml ./.repo/manifests/ || exit 1
-        repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
-        repopick -p -t U_asb_2025-03 || exit 1
+        #2025-04-05
+        # repopick -f 420932 || exit 1
+        # cp -v ./android/default.xml ./.repo/manifests/ || exit 1
+        # repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
+        repopick -p -t U_asb_2025-04 || exit 1
+        echo
+    fi
+    if [ "${rev}" == "22.2" ]; then
+        echo
+        #2025-04-05
+        # repopick -f 417621 || exit 1
+        # cp -v ./android/default.xml ./.repo/manifests/ || exit 1
+        # cp -v ./android/snippets/pixel.xml ./.repo/manifests/snippets/ || exit 1
+        # repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 || exit 1
+        repopick -p -t V_asb_2025-04 || exit 1
+        repopick -p -t V_asb_2025-04_pixel || exit 1
         echo
     fi
     return 0