Commits · d93f21535694c53cbe3608878eff191651884628 · Dhina17 / platform_frameworks_base

Oct 16, 2023

Merge "Don't apply UI width limitation to an external display" into main am:... · d93f2153

Riddle Hsu authored 1 year ago

Merge "Don't apply UI width limitation to an external display" into main am: 31331ed8 am: c7ddd492 am: a55cc161 am: d8f8e663

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

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

d93f2153

Merge "Don't apply UI width limitation to an external display" into main am:... · d8f8e663

Riddle Hsu authored 1 year ago

Merge "Don't apply UI width limitation to an external display" into main am: 31331ed8 am: c7ddd492 am: a55cc161

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

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

d8f8e663

Merge "Don't apply UI width limitation to an external display" into main am:... · a55cc161

Riddle Hsu authored 1 year ago

Merge "Don't apply UI width limitation to an external display" into main am: 31331ed8 am: c7ddd492

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

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

a55cc161

Merge "Don't apply UI width limitation to an external display" into main am: · c7ddd492

Riddle Hsu authored 1 year ago

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

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

c7ddd492

Merge "Don't apply UI width limitation to an external display" into main · 31331ed8
Riddle Hsu authored 1 year ago

31331ed8

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main... · 8532fe3b

Motomu Utsumi authored 1 year ago

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160c am: 419b5bf7 am: 93981966 am: 1272f06d

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

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

8532fe3b

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main... · 1272f06d

Motomu Utsumi authored 1 year ago

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160c am: 419b5bf7 am: 93981966

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

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

1272f06d

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main... · 93981966

Motomu Utsumi authored 1 year ago

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160c am: 419b5bf7

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

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

93981966

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: · 419b5bf7

Motomu Utsumi authored 1 year ago

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

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

419b5bf7

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main · b400160c
Motomu Utsumi authored 1 year ago

b400160c

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test"... · 95c1f287

Thiébaud Weksteen authored 1 year ago

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test" into main am: 663c9b34 am: 0b550caa am: a256a44f am: 549622b3

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

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

95c1f287

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test"... · 549622b3

Thiébaud Weksteen authored 1 year ago

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test" into main am: 663c9b34 am: 0b550caa am: a256a44f

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

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

549622b3

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test"... · a256a44f

Thiébaud Weksteen authored 1 year ago

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test" into main am: 663c9b34 am: 0b550caa

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

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

a256a44f

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test"... · 0b550caa

Thiébaud Weksteen authored 1 year ago

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test" into main am: 663c9b34

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

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

0b550caa

Oct 15, 2023
- Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test" into main · 663c9b34
  Thiébaud Weksteen authored 1 year ago
  
  663c9b34
Oct 13, 2023

Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main... · 63ca34ef

Victor Hsieh authored 1 year ago

Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main am: 3a5825e5 am: 6cdbd5de am: 7aae71e1 am: a058f78c

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

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

63ca34ef

Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main... · a058f78c

Victor Hsieh authored 1 year ago

Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main am: 3a5825e5 am: 6cdbd5de am: 7aae71e1

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

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

a058f78c

Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main... · 7aae71e1

Victor Hsieh authored 1 year ago

Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main am: 3a5825e5 am: 6cdbd5de

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

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

7aae71e1

Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main am: · 6cdbd5de

Victor Hsieh authored 1 year ago

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

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

6cdbd5de

Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main · 3a5825e5
Victor Hsieh authored 1 year ago

3a5825e5
Add OWNERS for JNI and test of PersistentDataBlockService · d523493e
Victor Hsieh authored 1 year ago
```
Test: N/A
Bug: 303523453
Change-Id: Ib861153b6bec91c612f55c21ee6bbf339240f15f
```
d523493e

Merge "Update OWNERS for BAL logic Change-Id:... · 932f546b

Achim Thesmann authored 1 year ago

Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main am: ca63bf60 am: 8948a769 am: 7eeb67fe am: 04a5e625

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

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

932f546b

Merge "Move PersistentDataBlock* in server to its namespace" into udc-qpr-dev-plus-aosp · a980d1fc
Victor Hsieh authored 1 year ago

a980d1fc

Merge changes from topic "revert_gc_fix" into udc-qpr-dev am: · ea8484b4

Matt Buckley authored 1 year ago

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

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

ea8484b4

[DO NOT MERGE] Revert "Mitigation for mass GC deletion" am: · 086fe948

Matt Buckley authored 1 year ago

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

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

086fe948

Merge "Update OWNERS for BAL logic Change-Id:... · 04a5e625

Achim Thesmann authored 1 year ago

Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main am: ca63bf60 am: 8948a769 am: 7eeb67fe

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

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

04a5e625

Merge changes from topic "revert_gc_fix" into udc-qpr-dev · 7ad6a353

Matt Buckley authored 1 year ago

* changes:
  [DO NOT MERGE] Revert "Mitigation for mass GC deletion"
  [DO NOT MERGE] Revert "Send cached target duration when creating sessions"

7ad6a353

Merge "Update OWNERS for BAL logic Change-Id:... · 7eeb67fe

Achim Thesmann authored 1 year ago

Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main am: ca63bf60 am: 8948a769

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

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

7eeb67fe

Merge "Update OWNERS for BAL logic Change-Id:... · 8948a769

Achim Thesmann authored 1 year ago

Merge "Update OWNERS for BAL logic Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main am: ca63bf60

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

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

8948a769

Merge "Update OWNERS for BAL logic Change-Id:... · ca63bf60

Achim Thesmann authored 1 year ago

Merge "Update OWNERS for BAL logic      Change-Id: I04fe3ac8f7d49d3b59395269d000817d59452d22 Test: presubmit (owners change only) Bug: 305115571" into main

ca63bf60

Merge "Avoid accidental shadowing in AGSL code." into main am: am:... · 0b5e898d

John Stiles authored 1 year ago

Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e am: 976a9062 am: 9fce1b42 am: 2cce29e6

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

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

0b5e898d

[automerger skipped] Merge "Avoid setup ANGLE again when determine whether to... · d829f22b

Peiyong Lin authored 1 year ago

[automerger skipped] Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 am: 7056ff60 am: 58ab4b3e -s ours

am skip reason: Merged-In I91f59c17100ac43ee8eea4f3fa8c86602c26a416 with SHA-1 b27fecd0 is already in history

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



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

d829f22b

[DO NOT MERGE] Revert "Mitigation for mass GC deletion" · be9bd5da

Matt Buckley authored 1 year ago

Revert submission 24828717

Reason for revert: performance concerns

Reverted changes: /q/submissionid:24828717

Bug: 300360668
Bug: 302620048

Change-Id: Iefb7488f6e100ca7cbb0d43337e5830860ebebe5

be9bd5da

Merge "Avoid accidental shadowing in AGSL code." into main am: am:... · 2cce29e6

John Stiles authored 1 year ago

Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e am: 976a9062 am: 9fce1b42

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

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

2cce29e6

Merge "Avoid setup ANGLE again when determine whether to show toast." into... · 58ab4b3e

Peiyong Lin authored 1 year ago

Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 am: 7056ff60

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

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

58ab4b3e

Merge changes from topic "dm-profile-validation" into main am: am:... · 9e337f9b

Jiakai Zhang authored 1 year ago

Merge changes from topic "dm-profile-validation" into main am: 7e72104d am: f0643a6b am: b16d9905 am: 028f33fd

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

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

9e337f9b

Revert^2 "Fail adb install on external profile errors." am: am:... · f51d9b51

Jiakai Zhang authored 1 year ago

Revert^2 "Fail adb install on external profile errors." am: 1dde3e7f am: b785772c am: af206077 am: 99b6b234

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

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

f51d9b51

Merge "Update AudioFormat setChannelMask comment" into main am: am:... · 62ed5ceb

Shunkai Yao authored 1 year ago

Merge "Update AudioFormat setChannelMask comment" into main am: 250365da am: 709f2a47 am: 63d05511 am: 2b8ba491

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

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

62ed5ceb

Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am:... · 540c36ca

Olivier Gaillard authored 1 year ago

Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b4 am: 154710d4 am: 3b84abda am: 0e75a926

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

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

540c36ca

Merge "Avoid accidental shadowing in AGSL code." into main am: am: · 9fce1b42

John Stiles authored 1 year ago

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

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

9fce1b42