- Oct 30, 2023
-
-
Treehugger Robot authored
[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e am: 260277aa -s ours am: fb316913 -s ours am skip reason: Merged-In If0b1432b78ec42a02446754ff6cf454fbb875048 with SHA-1 af27dfc3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922 Change-Id: Ifce78dd60b08202fb3309698cdc9796f9476a77f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Automerger Merge Worker authored
Merge "Merge "Zygote: do not fail if CE app data dir not found." into udc-dev am: b5914f9e am: 75be5ea3" into main
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e am: 42431ea1 am: 7be05ac3 -s ours" into main
-
Martijn Coenen authored
Merge "Zygote: do not fail if CE app data dir not found." into udc-dev am: b5914f9e am: 75be5ea3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25221877 Change-Id: Ia5d249ecb1559dc4e205e7e6ea583a24ca5b5873 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e am: 42431ea1 am: 7be05ac3 -s ours am skip reason: Merged-In If0b1432b78ec42a02446754ff6cf454fbb875048 with SHA-1 0ce1c1f9 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922 Change-Id: I16d94ad9f35344be32d270c4367c8f7dedb56351 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce am: d1e28662 -s ours am: b1bfc9e6 -s ours am: 15bf513d -s ours am: 1d55e1e6 -s ours am skip reason: Merged-In I664bb3003a2f6871113406e3257b7118bbdf2ab5 with SHA-1 12d0064e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: I56448163d6e5035359a6041bf0348fc7ed5689d8 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce am: 1445bb68 -s ours am: d3b64a62 -s ours am: 37b832f1 -s ours am skip reason: Merged-In I664bb3003a2f6871113406e3257b7118bbdf2ab5 with SHA-1 12d0064e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: Id2debab0a19b648888e7aafbbfb7ed2fe74ac277 Signed-off-by:
-
Martijn Coenen authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25221877 Change-Id: I91e681cfd1b099a774a9faf5495d072e30f2c651 Signed-off-by:
-
Achim Thesmann authored
-
Martijn Coenen authored
-
Treehugger Robot authored
[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e am: 260277aa -s ours am skip reason: Merged-In If0b1432b78ec42a02446754ff6cf454fbb875048 with SHA-1 af27dfc3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922 Change-Id: I84b000cb975e2dbc54b611615e3b53042d7e107b Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce am: d1e28662 -s ours am: b1bfc9e6 -s ours am: 15bf513d -s ours am skip reason: Merged-In I664bb3003a2f6871113406e3257b7118bbdf2ab5 with SHA-1 12d0064e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: I3c0508152a419f94078ae1954c9c26407b3f7e6f Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce am: 1445bb68 -s ours am: d3b64a62 -s ours am skip reason: Merged-In I664bb3003a2f6871113406e3257b7118bbdf2ab5 with SHA-1 12d0064e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: Ifc380142672a89f36882c45c202867e85810acee Signed-off-by:
-
Treehugger Robot authored
Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e am: 42431ea1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922 Change-Id: I8c81d7566ebb24f314cbbbdfbd952161999bf0d9 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce am: d1e28662 -s ours am: b1bfc9e6 -s ours am skip reason: Merged-In I664bb3003a2f6871113406e3257b7118bbdf2ab5 with SHA-1 12d0064e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: I13dbe5d680d67ef867289f0fbcf25c4bd480dedf Signed-off-by:
-
Kweku Adams authored
-
Jean-Michel Trivi authored
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922 Change-Id: I5eaa8157fac13a2c83308251003740beb13bf414 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce am: 1445bb68 -s ours am skip reason: Merged-In I664bb3003a2f6871113406e3257b7118bbdf2ab5 with SHA-1 12d0064e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: Iad299c8d633e836a788b5a1b907f8877d5b3e48c Signed-off-by:
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922 Change-Id: I061f06195e6d0ea386abeaf869bab7f661e14cea Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce am: d1e28662 -s ours am skip reason: Merged-In I664bb3003a2f6871113406e3257b7118bbdf2ab5 with SHA-1 12d0064e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: I7e05233ddf1d94fb43fc69c72b0ed1837aa46cbf Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Disable ControlsActivityTest and ControlsDialogsFactoryTest tests" into tm-qpr-dev am: 9e3062fd -s ours am: f57ecad0 -s ours am: a3b05bdd -s ours am: 84df8b57 -s ours am: a951ad65 -s ours am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25103281 Change-Id: I98148554260a79b9f1cfc7ebb492ea1d6f1fd508 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] Disable ControlsActivityTest and ControlsDialogsFactoryTest tests am: af54028c -s ours am: dad311d2 -s ours am: 085c3942 -s ours am: 1a696863 -s ours am: c8754199 -s ours am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25103281 Change-Id: I7930b2da30c794f8576812a6851b792386ef45c4 Signed-off-by:
-
Yan Yan authored
Merge "Respect caller config to disable VCN safe mode" into main am: ace49e05 am: ef43bcbe am: 8d415231 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802927 Change-Id: I175ac5841cc3745b92347286cb92754e700e0ac7 Signed-off-by:
-
Yan Yan authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2803455 Change-Id: Ie4156cae758785b733500e05a155de4790b36f25 Signed-off-by:
-
Roshan Pius authored
Merge "nfc(api): Expose formal APIs for APIs used by settings/sysui" into main am: 7c342823 am: a49117c9 am: 4a19111a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2808368 Change-Id: Iea1c00c84ac5c997eab9130d0e8ba2ac32c5b01e Signed-off-by:
-
Sadaf Ebrahimi authored
Merge "Adjust with changes in libxml2 upgrade" into main am: da32cbba am: ce9fbaca am: 966addac Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2772645 Change-Id: I2c041df4e6731e8d04cdce8a8a5fd7db62ea87a7 Signed-off-by:
-
Treehugger Robot authored
-
Treehugger Robot authored
[automerger skipped] Merge "Disable ControlsActivityTest and ControlsDialogsFactoryTest tests" into tm-qpr-dev am: 9e3062fd -s ours am: f57ecad0 -s ours am: a3b05bdd -s ours am: 84df8b57 -s ours am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25103281 Change-Id: I793bcd72aaf161de8684767e1fc01693a5381068 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] Disable ControlsActivityTest and ControlsDialogsFactoryTest tests am: af54028c -s ours am: dad311d2 -s ours am: 085c3942 -s ours am: 1a696863 -s ours am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25103281 Change-Id: I229862bfde9380d4777712d5b8bf9f4a712a08a5 Signed-off-by:
-
Yan Yan authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802927 Change-Id: I4e51f6f5a63d7e5da49e5856e7536b47401c042f Signed-off-by:
-
Yan Yan authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2803455 Change-Id: I58a098fe1ecd9292833325c39cb4d4b73c3ada22 Signed-off-by:
-
Treehugger Robot authored
Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: Ib12d8203ecb4a6c68adfa6a06c6ea9325f593dca Signed-off-by:
-
Treehugger Robot authored
Merge "[SB][Privacy] Fetch current active appops on startup." into sc-dev am: 54f3c01d am: b9181aa6 am: 5f932fb9 am: 8a3e02ce Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665127 Change-Id: I2b395a001a4e733baef545bfec547e65d4e247f9 Signed-off-by:
-
Beverly Tai authored
-
Roshan Pius authored
Merge "nfc(api): Expose formal APIs for APIs used by settings/sysui" into main am: 7c342823 am: a49117c9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2808368 Change-Id: Iafc099c71fffb470f0db4987b0c2fdece12b22c7 Signed-off-by:
-
Sadaf Ebrahimi authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2772645 Change-Id: I957a7c9221cfdd975370bfb6d1be1548172558b3 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Disable ControlsActivityTest and ControlsDialogsFactoryTest tests" into tm-qpr-dev am: 9e3062fd -s ours am: f57ecad0 -s ours am: 8c69e221 -s ours am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25103281 Change-Id: Ib35307743801035ac4d99de27d60abdcc4f96d31 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] Disable ControlsActivityTest and ControlsDialogsFactoryTest tests am: af54028c -s ours am: dad311d2 -s ours am: 1f0941c7 -s ours am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25103281 Change-Id: I07c680ef168378f676a14d89e946a767f8eff93b Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Disable ControlsActivityTest and ControlsDialogsFactoryTest tests" into tm-qpr-dev am: 9e3062fd -s ours am: f57ecad0 -s ours am: a3b05bdd -s ours am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25103281 Change-Id: Ibd3a229eb96f5dca94f78c5983eff8d0b3681ee2 Signed-off-by:
-
