Commits · 876446b112305649ff09b2dce0267ecb9f118646 · Dhina17 / platform_frameworks_base

Sep 29, 2023

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost"""... · 876446b1

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215



Change-Id: Id501e359f05cc551669b8ba816467eef622b07d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

876446b1

[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: -s ours · 0b9294f5

Anvesh Renikindi authored 1 year ago

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215

Change-Id: Ie63e3119194b0b772fbb2e72ed217a4bd89f0d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0b9294f5

Merge "Move page count to rememberPagerState" into aosp-main-future am: · f3decd99

Anvesh Renikindi authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860151

Change-Id: I1c81b0b23a7ccf64031bc77e475acb50cd81ce53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f3decd99

Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future · cfcad9c2
Anvesh Renikindi authored 1 year ago

cfcad9c2
Merge "Move page count to rememberPagerState" into aosp-main-future · e8a2bcbd
Anvesh Renikindi authored 1 year ago

e8a2bcbd

Merge "Added new framework-pdf jar inside MediaProvider module" into main am:... · ea26d808

Mark White authored 1 year ago

Merge "Added new framework-pdf jar inside MediaProvider module" into main am: e6c4de26 am: f9641091

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760388

Change-Id: Ie19ac593c83393b7938f2f533f703e15b89ec6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ea26d808

Merge "Added new framework-pdf jar inside MediaProvider module" into main am: · f9641091

Mark White authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760388

Change-Id: I6d833e61f568ecf73119c6ac5cd5f6d4790ea50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f9641091

Merge "Added new framework-pdf jar inside MediaProvider module" into main · e6c4de26
Mark White authored 1 year ago

e6c4de26

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: -s ours · 81dd77b9

Xin Li authored 1 year ago

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879326

Change-Id: Ie76038a96321a0b0ca12a04c8c4d56dac1bf27b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

81dd77b9

[automerger skipped] Merge UP1A.231005.007 am: -s ours · ac281ffd

Xin Li authored 1 year ago

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879326

Change-Id: Ifbdc306016c1a7e094ad9eac46c720f2acd708c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ac281ffd

Merge "Merge UP1A.231005.007" into aosp-main-future · ee8af043
Xin Li authored 1 year ago

ee8af043

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 0542b70d

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ie1031a2bd96b85fa44b23a2dc46363e9dd59c3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0542b70d

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 6dfd94a1

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Iabc5c6d15f7e1b25e60c4f0d416d032668921226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6dfd94a1

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 4420eab7

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I32ad328e67c46d9605e191675ca479f8ebb99271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4420eab7

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · d06e0acf

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ia869037c96a72937200e207907a072ada596c35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d06e0acf

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 8b6c78c7

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I8c9b34afafb28597afd38c887e965d395035c134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8b6c78c7

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · b4c64978

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Id08ae2f3f841511af4960004bb3aacf5ceffc824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b4c64978

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · a2afc42c

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ic5d881ca4e0c68edc53fcec53ab327ae45ff01b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a2afc42c

Sep 28, 2023

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 6b74b34a

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I014bdcff1d3dd3902c4155ce26b575a70846bcba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6b74b34a

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 39abde02

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ic6933da88e36b463ac5c71f5297f8eb824f891c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

39abde02

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 79be2c99

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I5a59e5f4bc95ecb45dbe11f0ebabdefda32f755a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

79be2c99

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 285b8a1b

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: Ie675bd43fc1c7022faa64fa0d66587e279ec0960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

285b8a1b

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts"... · 87de7ffc

Pinyao Ting authored 1 year ago

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109

Change-Id: I2211e60a745e9870688b94dba86fb31e7c6b21ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

87de7ffc

Merge "Make bootclasspath srcjar available to make" into main am: am: · 6be73d41

Anton Hansson authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760386

Change-Id: Ibefb528e5d8cfd59b19ea4d0aa54e61a0fbb2a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6be73d41

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev · 0e03b8d4
Pinyao Ting authored 1 year ago

0e03b8d4

Merge "Make bootclasspath srcjar available to make" into main am: · 5fc30c4d

Anton Hansson authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760386

Change-Id: I8f1dd20f28d978aab442c638c0e09c2c395bff19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5fc30c4d

Merge "Make bootclasspath srcjar available to make" into main · 53565bfd
Anton Hansson authored 1 year ago

53565bfd

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main... · 3045dc06

Treehugger Robot authored 1 year ago

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main am: 0c787f5b am: 4f3dc01e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765045

Change-Id: If8997fde967537be9d79f606936ddca90cce45b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3045dc06

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main am: · 4f3dc01e

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765045

Change-Id: I588eaa0c680916c5274d25b960e83e911efcacce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4f3dc01e

Merge "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files" into main · 0c787f5b
Treehugger Robot authored 1 year ago

0c787f5b

Merge "let's at least log the src mac as being the src mac, not the dst" into... · dac5af6f

Maciej Żenczykowski authored 1 year ago

Merge "let's at least log the src mac as being the src mac, not the dst" into main am: 9da7c8a3 am: db45188a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669

Change-Id: I67288cafb33d383df4b83569a906d517ab85818f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dac5af6f

Merge "let's at least log the src mac as being the src mac, not the dst" into main am: · db45188a

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669

Change-Id: I8fe1adddb5540b1896cdb9a22a96fb95e8deefe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

db45188a

Merge "let's at least log the src mac as being the src mac, not the dst" into main · 9da7c8a3
Maciej Żenczykowski authored 1 year ago

9da7c8a3

Sep 27, 2023

Merge "OWNERS: master -> main" into main am: am: · 7976dd0a

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765668

Change-Id: I031765bf94457de331705b91954e7f64dc55d681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7976dd0a

Merge "OWNERS: master -> main" into main am: am: · af77450f

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765552

Change-Id: Icbfc4e2a2ede782f812c099d38f727e59e4a267d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

af77450f

Merge UP1A.231005.007 · f984307b

Xin Li authored 1 year ago

Bug: 291102124
Merged-In: Idcbd0f2ba87290f090d693f0a64cb46fe8270b95
Change-Id: I64a40b9b56d5b18f8423d53abb5c1ba4429d5037

f984307b

Merge "OWNERS: master -> main" into main am: · 90787b09

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765668

Change-Id: I0a33734bc3a78547109c06428a032b0b5128123e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

90787b09

Merge "OWNERS: master -> main" into main am: · e557a3b8

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765552

Change-Id: I0d8f14fe574e2d639c422744813cd4990768c76e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e557a3b8

let's at least log the src mac as being the src mac, not the dst · 92bb8742

Maciej Żenczykowski authored 1 year ago


changing the field names is much harder due to it going via AIDL

Test: TreeHugger
Bug: 292404319
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4101caf3b0d2abfadbabf3f389155c29a4d64e0f

92bb8742

Merge "OWNERS: master -> main" into main am: am: · 867fe7aa

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765509

Change-Id: Ib4ab657246a49d1fef090297b52a1243e84bb11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

867fe7aa