Commits · 0e75a92696aaa5f0a44e77107c767b81356ea642 · Dhina17 / platform_frameworks_base

Oct 13, 2023

Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am:... · 0e75a926

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

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

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

0e75a926

Merge "Global scale must always be updated when size compat scale is changed"... · 3c971c3b

Robin Lee authored 1 year ago

Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab am: 42ee836e am: e5315e34

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

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

3c971c3b

Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: am: · 3b84abda

Olivier Gaillard authored 1 year ago

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

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

3b84abda

Merge "Global scale must always be updated when size compat scale is changed"... · e5315e34

Robin Lee authored 1 year ago

Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab am: 42ee836e

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

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

e5315e34

Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: · 154710d4

Olivier Gaillard authored 1 year ago

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

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

154710d4

Merge "Global scale must always be updated when size compat scale is changed"... · 42ee836e

Robin Lee authored 1 year ago

Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab

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

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

42ee836e

Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main · 8bbd22b4
Olivier Gaillard authored 1 year ago

8bbd22b4
Merge "Global scale must always be updated when size compat scale is changed" into main · 7b5463ab
Robin Lee authored 1 year ago

7b5463ab

Merge "Call exit instead of _exit when compiled with clang coverage" into main... · 79dc06e4

Treehugger Robot authored 1 year ago

Merge "Call exit instead of _exit when compiled with clang coverage" into main am: 0c175e28 am: fa58b4a9 am: 32df7715

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

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

79dc06e4

Merge "Call exit instead of _exit when compiled with clang coverage" into main... · 32df7715

Treehugger Robot authored 1 year ago

Merge "Call exit instead of _exit when compiled with clang coverage" into main am: 0c175e28 am: fa58b4a9

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

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

32df7715

Merge "Call exit instead of _exit when compiled with clang coverage" into main am: · fa58b4a9

Treehugger Robot authored 1 year ago

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

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

fa58b4a9

Merge "Call exit instead of _exit when compiled with clang coverage" into main · 0c175e28
Treehugger Robot authored 1 year ago

0c175e28

Oct 12, 2023

Call exit instead of _exit when compiled with clang coverage · 8adb0471

David Duarte authored 1 year ago

A function is registered with atexit when compiling with clang
coverage.
https://cs.android.com/android/platform/superproject/+/main:external/compiler-rt/lib/profile/InstrProfilingFile.c;l=508;drc=c58a43648cd6121c51a2e795a28e2ef90d7813e6

This function dumps coverage when the process exits.
However when calling System.exit from java this leads to a
call to _exit(2) which doesn't run exit hooks.

Instead when compiled with coverage call exit(3) to run
the exit hooks.

This behavior is the same as what the default "exit" option
of ART is doing.
https://cs.android.com/android/platform/superproject/+/master:art/libartbase/base/fast_exit.h;l=44;drc=bdf1737bd17132525bcfdc778663123b61e97fa3

Another way to fix this might be to call __llvm_profile_write_file
before _exit(2).

Test: run avatar and see if coverage increase
Bug: 304849228
Change-Id: Iec40612526f34472320be5ba5980cd1eea361ebc

8adb0471

Merge "Move PersistentDataBlock* in server to its namespace" into main am:... · 8fd0356a

Victor Hsieh authored 1 year ago

Merge "Move PersistentDataBlock* in server to its namespace" into main am: 0ac14085 am: 0e61ff6a am: 711471ed

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

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

8fd0356a

[automerger skipped] Merge "Avoid loading duplicate jobs." into main am:... · a4d2e929

Kweku Adams authored 1 year ago

[automerger skipped] Merge "Avoid loading duplicate jobs." into main am: 6d6c537b am: e6707e3a -s ours am: 12f7ac70 -s ours

am skip reason: Merged-In I3179261309031801f0506cf905206376e59af1fe with SHA-1 104d21d0 is already in history

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



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

a4d2e929

Merge "Move PersistentDataBlock* in server to its namespace" into main am:... · 711471ed

Victor Hsieh authored 1 year ago

Merge "Move PersistentDataBlock* in server to its namespace" into main am: 0ac14085 am: 0e61ff6a

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

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

711471ed

Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris.""... · f43850da

Automerger Merge Worker authored 1 year ago

Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am: 78e96991 -s ours" into udc-d1-dev-plus-aosp

f43850da

[automerger skipped] Merge "Avoid loading duplicate jobs." into main am:... · 12f7ac70

Kweku Adams authored 1 year ago

[automerger skipped] Merge "Avoid loading duplicate jobs." into main am: 6d6c537b am: e6707e3a -s ours

am skip reason: Merged-In I3179261309031801f0506cf905206376e59af1fe with SHA-1 104d21d0 is already in history

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



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

12f7ac70

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into... · d841e1cd

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am: e04fcd5b -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history

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



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

d841e1cd

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into... · ac863a9b

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am: 78e96991 -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history

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



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

ac863a9b

Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris.""... · 83f198fa

Automerger Merge Worker authored 1 year ago

Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 -s ours am: 2407dae7 -s ours" into udc-d1-dev-plus-aosp

83f198fa

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into... · 722f1187

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 -s ours am: 2407dae7 -s ours

am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d8 is already in history. Merged-In was found from reverted change.

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



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

722f1187

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into... · 819f8b11

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 am: 5c2fe7e8 -s ours

am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d8 is already in history. Merged-In was found from reverted change.

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

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



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

819f8b11

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into... · 78e96991

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history

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



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

78e96991

Merge "Move PersistentDataBlock* in server to its namespace" into main am: · 0e61ff6a

Victor Hsieh authored 1 year ago

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

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

0e61ff6a

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into... · e04fcd5b

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history

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



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

e04fcd5b

Merge "Avoid loading duplicate jobs." into main am: · e6707e3a

Kweku Adams authored 1 year ago

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

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

e6707e3a

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into... · 2407dae7

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 -s ours

am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d8 is already in history. Merged-In was found from reverted change.

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

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



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

2407dae7

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: ... · 5c2fe7e8

Treehugger Robot authored 1 year ago

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621

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

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

5c2fe7e8

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into... · 4f70c066

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history

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



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

4f70c066

Merge "Move PersistentDataBlock* in server to its namespace" into main · 0ac14085
Victor Hsieh authored 1 year ago

0ac14085
Merge "Avoid loading duplicate jobs." into main · 6d6c537b
Kweku Adams authored 1 year ago

6d6c537b

Avoid loading duplicate jobs. · 9b4ec7c8

Kweku Adams authored 1 year ago

If the persisted files have somehow accumulated duplicate versions of
the same job (identified by uid-namespace-jobId), then drop the
duplicates and only keep one.

Bug: 289062813
Bug: 296890885
Test: atest JobStoreTest
Change-Id: I3179261309031801f0506cf905206376e59af1fe
(cherry picked from commit c8fbd937)
Merged-In: I3179261309031801f0506cf905206376e59af1fe

9b4ec7c8

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: ... · d974f621

Treehugger Robot authored 1 year ago

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc

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

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

d974f621

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: ... · 4422416d

Treehugger Robot authored 1 year ago

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54

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

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

4422416d

Merge "Don't penalize app for slow app binding." into main am: am:... · 5506fba8

Kweku Adams authored 1 year ago

Merge "Don't penalize app for slow app binding." into main am: b8989c8b am: 8724066b am: 23954c97

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

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

5506fba8

Merge "Revert "Rollback package after reboot has been performed"" into main... · 3fde5e79

Harshit Mahajan authored 1 year ago

Merge "Revert "Rollback package after reboot has been performed"" into main am: 3f3a9465 am: 3e56a834 am: f0eef249

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

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

3fde5e79

Merge "Don't penalize app for slow app binding." into main am: am: · 23954c97

Kweku Adams authored 1 year ago

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

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

23954c97

Merge "Add module lib and test union java_api_library module" into main am:... · 43b3f4df

Jihoon Kang authored 1 year ago

Merge "Add module lib and test union java_api_library module" into main am: d135292f am: 1385c170 am: fc238577

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

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

43b3f4df

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: ... · bf624d54

Treehugger Robot authored 1 year ago

Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204

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

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

bf624d54