Kunal Malhotra
b0af2f9b9f
Merge "Removing the word "default" from JavaDocs as these do not seem to be the default policy"
2022-09-20 16:49:30 +00:00
TreeHugger Robot
404b70e411
Merge "Makes UM.isUsersOnSecondaryDisplaysSupported() @TestApi"
2022-09-20 02:59:22 +00:00
Kunal Malhotra
cc4d2a3bda
Removing the word "default" from JavaDocs as these do not seem to be the
...
default policy
Test: manual
Change-Id: I7a3b0cadfd5d6220b5667ef7e244d55b7c3499ba
2022-09-20 00:09:12 +00:00
Treehugger Robot
8f49373913
Merge "Clarify method names and improve debug" am: 1ab7ac7f56 am: 1d74b8207b am: a6a8219798 am: f1f8a7519c am: dd2eed7053
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306
Change-Id: I35466159e53b25b3b00c0b2afd540a265b43f482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-17 12:35:25 +00:00
Treehugger Robot
dd2eed7053
Merge "Clarify method names and improve debug" am: 1ab7ac7f56 am: 1d74b8207b am: a6a8219798 am: f1f8a7519c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306
Change-Id: I0139bcffa3e11a90e36e228d371f478ae851d5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-16 13:58:32 +00:00
Treehugger Robot
a6a8219798
Merge "Clarify method names and improve debug" am: 1ab7ac7f56 am: 1d74b8207b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306
Change-Id: I922d2d8012d82ce7dfa8a1c70e2582b60e98761e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-16 12:47:39 +00:00
Neil Fuller
d272f786c2
Clarify method names and improve debug
...
Change LocationTime.getTime() -> getUnixEpochMillis() for clarity.
Add LocationTime.toString() to improve log messages involving
LocationTime.
Test: build only
Bug: 236611620
Change-Id: I6f33bec6288c67e18a2008a735e88a8981186183
2022-09-16 09:03:00 +00:00
Grace Cheng
eedebc0b06
Merge "Adds a function in LM for fetching ADAS allowlist" into tm-qpr-dev am: 8efbf0ee61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19799651
Change-Id: I36a71fede0ed21ec570c888e19cb1bb42cf76cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-15 18:21:18 +00:00
Grace Cheng
8efbf0ee61
Merge "Adds a function in LM for fetching ADAS allowlist" into tm-qpr-dev
2022-09-15 17:54:32 +00:00
Felipe Leme
652047ab11
Makes UM.isUsersOnSecondaryDisplaysSupported() @TestApi
...
Initially, UM.isUsersOnSecondaryDisplaysEnabled() was marked @TestApi,
but that's an static API meant to be used internally only.
Test: m update-api
Bug: 246003632
Change-Id: Icca31e7b82ffd03645a5cb27af27325c1bfc0bfe
2022-09-15 16:47:27 +00:00
Zimuzo Ezeozue
c8287e3b44
Merge "Clean up binder txn tracking special case"
2022-09-15 07:29:07 +00:00
Hani Kazmi
9cce3d7dd5
Merge "Add a lock when unwrapping lazy value in bundles"
2022-09-14 12:05:26 +00:00
Philip Junker
a7610b3b17
Merge "Sync BatteryStats user activity types with PowerManager ones."
2022-09-14 08:39:44 +00:00
Zim
fe43ff2732
Clean up binder txn tracking special case
...
Previously, binder txns were only traced for txns from sysui/launcher
to system_server.
ag/Iffc4bb534d239c07d2e4d43ab43a9ed76abe7496 enabled binder txn tracking
more broadly
Removed the special case for sysui/launcher and cleaned up the code
Test: Manual
Bug: 161393989
Change-Id: I9d46d2362ca0ca33bc2477d68092f7ba5fe9c8ac
2022-09-13 15:18:55 +01:00
Zim
dd3be999d2
Enable binder txn tracing more broadly
...
Previously, binder txns were only traced for txns from sysui/launcher
to system_server.
aosp/I57857443495475b1d2efa82cbcb448af5d37a79a and
aosp/I01d520afa8e26eabb97318192151b707b002c28b enabled aidl tracing
if aidl#gen_trace or aidl#generate_traces respectively is true.
Guarded tracing on the availability of txn names instead
Test: Manual
Bug: 161393989
Change-Id: Iffc4bb534d239c07d2e4d43ab43a9ed76abe7496
2022-09-13 15:18:19 +01:00
Dmitri Plotnikov
4e0d271b00
Merge "Add proto output of battery usage stats"
2022-09-12 19:49:49 +00:00
Lais Andrade
a76cbecf3e
Merge "Remove VibrationEffect javadocs to methods not available in public APIs." am: db3fb60b2b am: ef283f4387 am: 6b4a499166 am: fdf8a663c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214741
Change-Id: I2f61798d0fa0f2d620019848a67138e7235f09cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-12 17:45:24 +00:00
Lais Andrade
6b4a499166
Merge "Remove VibrationEffect javadocs to methods not available in public APIs." am: db3fb60b2b am: ef283f4387
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214741
Change-Id: I02aa723acad8be946973e2bd3baf407490a07f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-12 15:42:53 +00:00
Lais Andrade
55217bc20b
Remove VibrationEffect javadocs to methods not available in public APIs.
...
Change-Id: Idf5a339a5fb0ffd510e7fda0e3784916c8505eae
Merged-In: Idf5a339a5fb0ffd510e7fda0e3784916c8505eae
Fix: 245491186
Test: N/A
2022-09-12 12:21:16 +00:00
Lais Andrade
af7ed63720
Update VibrationEffect.Composition.compose documentation
...
Update wording around the compose() method to refer to composition elements, not only primitives.
Change-Id: Idf5a339a5fb0ffd510e7fda0e3784916c8505eae
Bug: 245491186
Test: N/A
2022-09-12 12:19:33 +00:00
Dmitri Plotnikov
db0d388e48
Add proto output of battery usage stats
...
Bug: 245832387
Test: adb shell dumpsys batterystats --usage --proto | \
gqui from rawproto:- proto $ANDROID_BUILD_TOP/frameworks/base/core/proto/android/os/batteryusagestats.proto:android.os.BatteryUsageStatsAtomsProto --protoprint_annotations=no
Change-Id: I297f09892accf0d2adef41d4cbd384a505c9c189
2022-09-09 09:52:18 -07:00
Treehugger Robot
8b4bb7b68c
Merge "change the format" am: cac091cedb am: 1d863c4a76 am: a2a73957bf am: d1e2293394 am: 32b0d92d61
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2209999
Change-Id: I058510e5063756313c1e2eb8447697483c33082f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 00:13:24 +00:00
Treehugger Robot
32b0d92d61
Merge "change the format" am: cac091cedb am: 1d863c4a76 am: a2a73957bf am: d1e2293394
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2209999
Change-Id: I334f821d7134557dbd5f9acb964df49acedd48b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 23:25:59 +00:00
Treehugger Robot
a2a73957bf
Merge "change the format" am: cac091cedb am: 1d863c4a76
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2209999
Change-Id: Ieb6d01f73dadc20e1dbfd5511faa67cd03a8553c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:11:23 +00:00
Treehugger Robot
cac091cedb
Merge "change the format"
2022-09-08 21:31:23 +00:00
Xiaozhen Lin
ce5a2ae1b0
change the format
...
use "file:" instead of "include"
Test: N/A
Change-Id: I7db7abba49b117f782b557926d06fa858223185b
2022-09-07 22:42:57 +00:00
Grace Cheng
c6ab602b60
Merge "Adds a function in LM for fetching ADAS allowlist"
2022-09-07 17:11:14 +00:00
Hani Kazmi
c1d18f34ea
Merge "Add javadoc note about bug in readParcelableCreatorInternal" into tm-dev am: 5421a3f422 am: 530c9780d8 am: 494fbd29d2 am: 9075299d91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459102
Change-Id: I472f6c523c97b096d9a4f3ce81bf9cf7a1f2b70e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 14:04:34 +00:00
Hani Kazmi
9075299d91
Merge "Add javadoc note about bug in readParcelableCreatorInternal" into tm-dev am: 5421a3f422 am: 530c9780d8 am: 494fbd29d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459102
Change-Id: I081c2a2f2ed561377a85baaebd08ee16a2ede0a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 13:44:33 +00:00
Hani Kazmi
494fbd29d2
Merge "Add javadoc note about bug in readParcelableCreatorInternal" into tm-dev am: 5421a3f422 am: 530c9780d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459102
Change-Id: I6874ba1e634a7b344bd5e7d410a8c6ec0324060d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 13:33:25 +00:00
Hani Kazmi
dba9fb34b6
Merge "Add javadoc note about bug in readParcelableCreatorInternal" into tm-dev am: 5421a3f422
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459102
Change-Id: I482ab929747f012806d5dccbec6ffc5c7b8dd457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 13:02:51 +00:00
Hani Kazmi
5421a3f422
Merge "Add javadoc note about bug in readParcelableCreatorInternal" into tm-dev
2022-09-06 12:39:44 +00:00
Treehugger Robot
476ac697b3
Merge "Update OWNERS file for Multiuser." am: 724eea8b2e am: 38bd2db5fc am: 387b6df342 am: 0ef1ac4876 am: 1c14dd5ac5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2179455
Change-Id: I799a9bb31e9082f67ff882e6ac99adf6f4eb5236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 13:32:02 +00:00
Treehugger Robot
1c14dd5ac5
Merge "Update OWNERS file for Multiuser." am: 724eea8b2e am: 38bd2db5fc am: 387b6df342 am: 0ef1ac4876
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2179455
Change-Id: I1720eb7c3670e96e989efad55e34c7fbdc5c32ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 13:04:04 +00:00
Treehugger Robot
387b6df342
Merge "Update OWNERS file for Multiuser." am: 724eea8b2e am: 38bd2db5fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2179455
Change-Id: Ifabead340794f49bc9d72be1a71ada6ab5ae4803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 11:59:51 +00:00
Treehugger Robot
724eea8b2e
Merge "Update OWNERS file for Multiuser."
2022-09-05 10:55:36 +00:00
Zixuan Qu
47196b1422
Merge "Register VibrationSettings as a listener to: 1) virtual displays creation and removal. 2) App Uids running on virtual displays. These will be used in combination to ignore vibration initiated from a virtual display." into tm-qpr-dev am: 442f33f79e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19813060
Change-Id: Ib7071d4a7affded34e5ff58482e55521c7532a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 16:45:09 +00:00
Zixuan Qu
442f33f79e
Merge "Register VibrationSettings as a listener to: 1) virtual displays creation and removal. 2) App Uids running on virtual displays. These will be used in combination to ignore vibration initiated from a virtual display." into tm-qpr-dev
2022-09-02 16:18:58 +00:00
Hani Kazmi
9da89484bd
Add a lock when unwrapping lazy value in bundles
...
This commit addresses a race condition introduced in ag/18909939. If
multiple threads try to read the same lazy value out of mMap in
parallel, it is possible for both to decrement mLazyValues, thus failing
the precondition check, or recycling the parcel twice.
While bundles do not guarantee thread safety, there have already been
enough reports of impacted usecases that it is worth mitigating at the
root.
It is possible to shorten the lock to not include the recycle block, but
both implementations did not show any performance difference
in preliminary testing.
Bug: 241888992
Test: Reproduced race condition on physical device, and validated that
code change fixes it.
Test: atest android.os.cts.ParcelTest android.os.cts.BundleTest
android.os.BundleTest android.os.ParcelTest
android.os.BundleRecylingTest
Change-Id: I5d261d4315a123008b226c364fec73634e08a150
2022-09-02 14:09:15 +00:00
Hani Kazmi
5ffffa5702
Add javadoc note about bug in readParcelableCreatorInternal
...
follow up to b/232589966. Bug was fixed in master, but did not have time
to merge into T. Adding a note to aid developers in using the old API if
impacted.
Test: m
Bug: 240585930
Change-Id: Ibd80007b63ff8d2ad87e18c6c4d0ffedb5184ff5
2022-09-02 14:06:45 +00:00
Hani Kazmi
80d19a9967
Merge "Update BaseBundle to not use LazyValues when using ReadWriteHelper" into tm-dev am: 91e0c35911
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537071
Change-Id: I0d935e78b286f05592d8b889ea38c2e8f4d7cfeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 19:45:59 +00:00
Zixuan Qu
913ddceb07
Register VibrationSettings as a listener to:
...
1) virtual displays creation and removal.
2) App Uids running on virtual displays.
These will be used in combination to ignore vibration initiated from a virtual display.
This change also consolicates the fix to avoid Null reference when VirtualDeviceManger
is not present in the available system services. See also ag/19744341.
Test: VibrationSettingsTest, VibratorManagerServiceTest
bug: 189474679
Change-Id: Ie10dbfe65bb3ab9d62ed5c7b5ed7095a51bccf24
Merged-In: Ie10dbfe65bb3ab9d62ed5c7b5ed7095a51bccf24
(cherry picked from commit a0ae5c1951 )
2022-09-01 18:01:59 +00:00
Hani Kazmi
6dceed5601
Merge "Update BaseBundle to not use LazyValues when using ReadWriteHelper" into tm-qpr-dev am: 51eece2ac4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19754636
Change-Id: I51c0c655b3401e1022242bef8e89791d7fefe0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 16:53:14 +00:00
Simon Bowden
8822d4c9ec
Add FLAG_PIPELINED_EFFECT to VibrationAttributes.
...
Effects with this flag will not interrupt running effects that also have this flag.
This is an experiment to see whether it improves results for high-frequency vibrations.
Bug: 244362817
Test: atest
Change-Id: Idfca1394e44188e9e797938c729ce6d91b1ed868
2022-09-01 16:58:00 +01:00
Dmitri Plotnikov
657bec85e5
Merge "Add EnergyConsumer data to battery history"
2022-08-31 21:42:42 +00:00
Miguel Aranda
2d53d9e869
Merge "Enable StrictMode checks for explicit garbageCollection from T." am: ace6c8c76e am: 0c6f92501a am: 54bbbedfd2 am: 4856f61946 am: d1729b65c8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051241
Change-Id: I82b066a8fdf8b740854e7f88971046d0ae67bd1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-31 17:29:56 +00:00
Grace Cheng
390046b0db
Adds a function in LM for fetching ADAS allowlist
...
Bug: 244264468
Test: none
Change-Id: I0bf0d4e0ef45aea8726d52bc661a6713c5e986ce
2022-08-31 16:56:45 +00:00
Miguel Aranda
d1729b65c8
Merge "Enable StrictMode checks for explicit garbageCollection from T." am: ace6c8c76e am: 0c6f92501a am: 54bbbedfd2 am: 4856f61946
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051241
Change-Id: I39a28d6edf551807a52ad8c593768350812b197d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-31 16:55:48 +00:00
Grace Cheng
0a5ebb9c58
Adds a function in LM for fetching ADAS allowlist
...
Bug: 244264468
Test: none
Change-Id: I0bf0d4e0ef45aea8726d52bc661a6713c5e986ce
2022-08-31 16:49:34 +00:00
Miguel Aranda
54bbbedfd2
Merge "Enable StrictMode checks for explicit garbageCollection from T." am: ace6c8c76e am: 0c6f92501a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051241
Change-Id: Ie9b17a88e0664585fc1d2c1fce17263accb8392a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-31 15:49:05 +00:00