- Feb 21, 2024
-
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2971151 Change-Id: I72bb86884b0bd1861b194fd81c071fb0b61570de Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Yahav Nussbaum authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970214 Change-Id: I42e58c7661b06acc8e7aac9f08fbad2faf28cc42 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
-
Yahav Nussbaum authored
-
Kangping Dong authored
[automerger skipped] Merge "[Thread] rename package name for Thread platform flags" into main am: 33ec6c0f -s ours am skip reason: Merged-In Icacf88f7c0aa499b4b29f4072ae58840f0b1761f with SHA-1 9cb44920 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2968526 Change-Id: Ie23608bcacc4fc238beddf8c75a2b9f0c35a6114 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Kangping Dong authored
am skip reason: Merged-In Icacf88f7c0aa499b4b29f4072ae58840f0b1761f with SHA-1 9cb44920 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2968526 Change-Id: I8a12f73d501353b56ad26aa2f2ff0d04a0616354 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Kangping Dong authored
-
yuanhuan authored
Before collect new created task fragment in createTaskFragment(), recomputeConfiguration() will set a crop in PendingTransaction,which will cause starting window be cropped before staring window reparent to root task in SyncTransaction.So addToSyncSet() before recomputeConfiguration(). Test: pressure test cold-lauch Activity Embeded apps and no flash black. Bug: b/324148725 Change-Id: I7ded9adb1c52d61b700edfdc83e7929cff67e529
-
Piotr Wilczyński authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2929637 Change-Id: Ib5cd8e343abf603ce43cf3938ea2c78659ba71bf Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Piotr Wilczyński authored
-
Kangping Dong authored
-
Yahav Nussbaum authored
Bug: 324993608 Test: TH Change-Id: Ic3b7f9a7d8cf29d9f4cd51a39dd51488fbb62fe3
-
Suprabh Shukla authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970332 Change-Id: Idfac1cc86e68c1bc5ece7d5b02440b04a43e288f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Suprabh Shukla authored
-
- Feb 20, 2024
-
-
Nader Jawad authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2950305 Change-Id: I7e06b809ba2fd950506d87437f52a3788a9ea84d Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Shrinidhi Hegde authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2953747 Change-Id: I9cdcbdf8a4fcc7115bbcb7ff51f04fa67dcd0312 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Nader Jawad authored
-
Shrinidhi Hegde authored
-
Suprabh Shukla authored
This reverts commit 951e4bd8 and commit b6a3ff2d Test: atest CtsHostsideNetworkTests Test: atest resolv_integration_test Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest Bug: 304347838 Change-Id: I0c8e0c713f0a7aae7f0ab99e42d97d5bf770bc47
-
Gaurav Gupta authored
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2952026 Change-Id: I0039fd64b6af6ee09f7ad602d32b1421d645551c Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Nino Jagar authored
Bug: 316989461 Test: N/A (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3065c363c66b2885889202d7288474b145d5888a) Merged-In: Ia79c3a4c487b3cbb3335b386630baefa8d661a64 Change-Id: Ia79c3a4c487b3cbb3335b386630baefa8d661a64
-
Gaurav Gupta authored
-
Treehugger Robot authored
-
Massimo Carli authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2952994 Change-Id: Ie91b90300bbfe0214de20e8254a0006cf4249eef Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Massimo Carli authored
-
Shrinidhi Hegde authored
Added high impact rollback as a last resort after low impact rollbacks are tried. Also removed reference to automatic rollback deny list, since we will be using impact level instead of the deny list going forward. Bug: 291137901 Test: Unit tests Change-Id: I4d75dd513b3f43c179baf93ece832f9007173ff4
-
Kangping Dong authored
There are two Thread flag files in frameworks/base and packages/modules/Connectivity/thread. Both are currently using the same "com.android.net.thread.flags" package name for their flags. While all flags needs to be built in a aconfig_declarations target, two aconfig_declarations can't have the same package name: ``` FAILED: out/soong/build.aosp_arm.ninja cd "$(dirname "out/host/linux-x86/bin/soong_build")" && BUILDER="$PWD/$(basename "out/host/linux-x86/bin/soong_build")" && cd / && env -i "$BUILDER" --top "$TOP" --soong_out "out/soong" --out "out" --soong_variables out/soong/soong.aosp_arm.variables -o out/soong/b uild.aosp_arm.ninja --globListDir aosp_arm --globFile out/soong/globs-aosp_arm.ninja -l out/.module_paths/Android.bp.list --available_env out/soong/soong.environment.available --used_env out/soong/soong.environment.used.aosp_arm.build Android.bp 2 aconfig_declarations found for package com.android.net.thread.flags ``` To resolve this issue, this commit renames the platform flags to package name "android.net.thread.platform.flags". This commit is required by ag/26286387 Bug: 325886480 Merged-In: Icacf88f7c0aa499b4b29f4072ae58840f0b1761f Change-Id: Icacf88f7c0aa499b4b29f4072ae58840f0b1761f
-
Kangping Dong authored
(This is a cherry-pick of aosp/2968526 for resolving merge conflicts) There are two Thread flag files in frameworks/base and packages/modules/Connectivity/thread. Both are currently using the same "com.android.net.thread.flags" package name for their flags. While all flags needs to be built in a aconfig_declarations target, two aconfig_declarations can't have the same package name: ``` FAILED: out/soong/build.aosp_arm.ninja cd "$(dirname "out/host/linux-x86/bin/soong_build")" && BUILDER="$PWD/$(basename "out/host/linux-x86/bin/soong_build")" && cd / && env -i "$BUILDER" --top "$TOP" --soong_out "out/soong" --out "out" --soong_variables out/soong/soong.aosp_arm.variables -o out/soong/b uild.aosp_arm.ninja --globListDir aosp_arm --globFile out/soong/globs-aosp_arm.ninja -l out/.module_paths/Android.bp.list --available_env out/soong/soong.environment.available --used_env out/soong/soong.environment.used.aosp_arm.build Android.bp 2 aconfig_declarations found for package com.android.net.thread.flags ``` To resolve this issue, this commit renames the platform flags to package name "android.net.thread.platform.flags". This commit is required by ag/26286387 Bug: 325886480 Merged-In: Icacf88f7c0aa499b4b29f4072ae58840f0b1761f Change-Id: Icacf88f7c0aa499b4b29f4072ae58840f0b1761f
-
Treehugger Robot authored
am skip reason: Merged-In I1b35078cbc5f581b6b13daa8afcb6eee1aa2a15f with SHA-1 abb2ea62 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2968942 Change-Id: Iab25e4abc52043b387054bca4ff03e4f2fa94e36 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Zoey Chen authored
am skip reason: Merged-In I1b35078cbc5f581b6b13daa8afcb6eee1aa2a15f with SHA-1 abb2ea62 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2968942 Change-Id: If1e71ec7c57fd6365ec094881253aa345ccc9f35 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
-
Zoey Chen authored
Bug: N/A Test: manual Change-Id: I64f066a696ec41d55716fd03fde395c50ec15067 Merged-In: I1b35078cbc5f581b6b13daa8afcb6eee1aa2a15f
-
Julien Desprez authored
Merge "Add RootTargetPreparer for explicitly specifying the root dependency" into main am: 5613fb78 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2963562 Change-Id: Id2a5c535854e3ba45cf333b23482642ceb893b2e Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Julien Desprez authored
-
- Feb 19, 2024
-
-
Marcelo Arteiro authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2967863 Change-Id: Ic476aec8b567a2d909368307491ae5fc86982d35 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Marcelo Arteiro authored
-
Marcelo Arteiro authored
Bug: none Test: none Flag: NONE (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cc0dd126b74a56774d7887dcb4ccd655ad0d0e45) Change-Id: I2c508cae9c2d499a0fc53b97698d4a0165f00c14
-
Azhara Assanova authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2956479 Change-Id: I13b82f2257702982df9177605dce4f3148b269e1 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Azhara Assanova authored
-