Benedict Wong
9c66126e95
Merge "Add support for app data accounting for in-kernel dataplanes" am: 69e2f04207 am: cdb9503af4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749070
Change-Id: I583a872bcb18f1b749f4ab0b49cbc9323920f048
2021-07-02 19:12:24 +00:00
Kevin Han
117e58256b
Merge "Actually count explicit broadcasts as usage" into sc-dev am: 9e3ce77cca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179083
Change-Id: I5d54f0ec7fa0655f5dac012f04a47ebf8a63a87f
2021-07-02 19:06:25 +00:00
Mark Renouf
f5ff9a0425
Merge "Revert "Revert "Fix mPositionInWindow to not use global coords""" into sc-dev am: 2fe11f121d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15172668
Change-Id: I4dcb7a6bca2038484f5399dc4d3871aff2fb5352
2021-07-02 19:06:15 +00:00
Kevin Han
0b6c6a09c9
Merge "Actually count explicit broadcasts as usage" into sc-dev am: 9e3ce77cca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179083
Change-Id: I88a1502a71b86d15121558cfcc5ae7f2a7e1b653
2021-07-02 19:05:51 +00:00
Mark Renouf
cf6f098598
Merge "Revert "Revert "Fix mPositionInWindow to not use global coords""" into sc-dev am: 2fe11f121d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15172668
Change-Id: Ib2338b948eba6a126a079909fe489fc4fba86a5b
2021-07-02 19:05:39 +00:00
Jayant Chowdhary
53be09b2df
camera2: Update mandatory streams for ultra high resolution sensors.
...
The updated mandatory streams include default sensor pixel mode targets
in addition to maximum resolution sensor pixel mode targets, in the same
camera capture session. This is so that sensor pixel mode can be
switched per CaptureRequest without creating a new session.
Bug: 184574750
Test: Camera CTS
Change-Id: Idc2c23f4942942fb81f243dc7ffea5dcbf94dec5
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com >
2021-07-02 12:04:59 -07:00
TreeHugger Robot
af325d9679
[automerger skipped] Merge "[DO NOT MERGE] Global actions tip" into sc-dev am: 70c9f8b8b5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188907
Change-Id: I1725f877830d39628396e2e0543ec1e86b0e87cc
2021-07-02 19:04:57 +00:00
Mill Chen
97a5ed010a
Merge "Update dynamic height adjusting" into sc-dev am: e665e27525
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187824
Change-Id: I5822ec7cd641675c6ddce686d1978961cbc9c7c4
2021-07-02 19:04:31 +00:00
TreeHugger Robot
0ee139f112
Merge "[DO NOT MERGE] Global actions tip" into sc-dev am: 70c9f8b8b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188907
Change-Id: Ifaa8ff9398810bafd898bd613f2dbcf84df7b7ba
2021-07-02 19:04:10 +00:00
Matt Pietal
49475ca475
[DO NOT MERGE] Global actions tip am: cfd4b956db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188907
Change-Id: I729f987ba011dd6b26ca8cd62019150b93447503
2021-07-02 19:04:05 +00:00
Mill Chen
e0e87f2ecf
Merge "Update dynamic height adjusting" into sc-dev am: e665e27525
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187824
Change-Id: I96aac9546331229fd2be208eb40476c30e6f5348
2021-07-02 19:03:08 +00:00
Kevin Han
9e3ce77cca
Merge "Actually count explicit broadcasts as usage" into sc-dev
2021-07-02 19:02:45 +00:00
Benedict Wong
b9c06bc020
Merge "Add VCN underlying networks" am: 447fbc3788
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1750241
Change-Id: Icc0f1d0dbad2f0dd5bb065f8da670018bd778213
2021-07-02 18:58:42 +00:00
Benedict Wong
cdb9503af4
Merge "Add support for app data accounting for in-kernel dataplanes" am: 69e2f04207
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749070
Change-Id: I2079586851fc48ddaae451d5d5aeb82ba34f2364
2021-07-02 18:58:06 +00:00
Josh Tsuji
542d10b22e
Merge "Clamp brightness to dim value if we're timing out and playing the screen off animation." into sc-dev am: 8938a91f1a am: 384af4ae47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15182384
Change-Id: I2f696449f7d354c4fa62301d2897b58c2aa6f6d4
2021-07-02 18:55:08 +00:00
TreeHugger Robot
0dad458d61
Merge "Fix sharing shortcuts not showing for Work Profile. Check package by using selected profile PackageManager." into sc-dev am: 1bbe3ab314 am: fe884ea959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180074
Change-Id: Ie73665643f796d9dff9435cc88f27b3e1c100f9f
2021-07-02 18:54:28 +00:00
Mark Renouf
2fe11f121d
Merge "Revert "Revert "Fix mPositionInWindow to not use global coords""" into sc-dev
2021-07-02 18:54:07 +00:00
Mihir Patel
cad0b7dbf4
Merge "Guarding against null pointer exception when setting view structure info for content capture" into sc-dev am: 59fe064d75 am: 776e23f3cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067633
Change-Id: If8615558338297cf93076d1a78d2337dc98c7e09
2021-07-02 18:53:47 +00:00
TreeHugger Robot
70c9f8b8b5
Merge "[DO NOT MERGE] Global actions tip" into sc-dev
2021-07-02 18:52:51 +00:00
Mill Chen
e665e27525
Merge "Update dynamic height adjusting" into sc-dev
2021-07-02 18:48:50 +00:00
Josh Tsuji
f0d7e94afc
Merge "Clamp brightness to dim value if we're timing out and playing the screen off animation." into sc-dev am: 8938a91f1a am: 2305a94f53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15182384
Change-Id: Icb5689b7cb0ffd93c4233b8150b468a77460515f
2021-07-02 18:47:18 +00:00
TreeHugger Robot
c06482e5b9
Merge "Fix sharing shortcuts not showing for Work Profile. Check package by using selected profile PackageManager." into sc-dev am: 1bbe3ab314 am: 31405dca3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180074
Change-Id: I7c568a768fb7490f9a0e068d585167d89134968a
2021-07-02 18:47:10 +00:00
Mihir Patel
74193671e3
Merge "Guarding against null pointer exception when setting view structure info for content capture" into sc-dev am: 59fe064d75 am: 2e8b06aa11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067633
Change-Id: I41642583099cfc4dd252e8b411755247998f6b98
2021-07-02 18:46:39 +00:00
Treehugger Robot
cc71de967b
Merge "Allow the kernel to upgrade ASYNC mode processes to SYNC mode." am: fc2745ae54 am: 791e6e8bfc am: 3afa9fae1a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754778
Change-Id: I5bec56d24c667e87467552535deb0619d6759a8a
2021-07-02 18:44:52 +00:00
Benedict Wong
447fbc3788
Merge "Add VCN underlying networks"
2021-07-02 18:42:43 +00:00
Benedict Wong
69e2f04207
Merge "Add support for app data accounting for in-kernel dataplanes"
2021-07-02 18:42:15 +00:00
Josh Tsuji
384af4ae47
Merge "Clamp brightness to dim value if we're timing out and playing the screen off animation." into sc-dev am: 8938a91f1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15182384
Change-Id: I07a4722957a1c82a656230441c23ee81149b552e
2021-07-02 18:37:35 +00:00
TreeHugger Robot
fe884ea959
Merge "Fix sharing shortcuts not showing for Work Profile. Check package by using selected profile PackageManager." into sc-dev am: 1bbe3ab314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180074
Change-Id: I7634b673ae8ce1f11f6a8615750bb1f871b4a5f5
2021-07-02 18:37:28 +00:00
Mihir Patel
776e23f3cc
Merge "Guarding against null pointer exception when setting view structure info for content capture" into sc-dev am: 59fe064d75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067633
Change-Id: I44029be8fb1c54fcda0915274684be4952341581
2021-07-02 18:37:06 +00:00
Josh Tsuji
2305a94f53
Merge "Clamp brightness to dim value if we're timing out and playing the screen off animation." into sc-dev am: 8938a91f1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15182384
Change-Id: I3dde2d4d3c5247e57d960f8b15dab7ae811a929c
2021-07-02 18:36:11 +00:00
TreeHugger Robot
31405dca3e
Merge "Fix sharing shortcuts not showing for Work Profile. Check package by using selected profile PackageManager." into sc-dev am: 1bbe3ab314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180074
Change-Id: I66ba4fa883043d6b974687dc10231ffc90394094
2021-07-02 18:36:02 +00:00
Mihir Patel
2e8b06aa11
Merge "Guarding against null pointer exception when setting view structure info for content capture" into sc-dev am: 59fe064d75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067633
Change-Id: I0aedd4c93b572c07dbf80ab67f9f47d0c2c668a4
2021-07-02 18:35:36 +00:00
Josh Tsuji
8938a91f1a
Merge "Clamp brightness to dim value if we're timing out and playing the screen off animation." into sc-dev
2021-07-02 18:35:12 +00:00
TreeHugger Robot
1bbe3ab314
Merge "Fix sharing shortcuts not showing for Work Profile. Check package by using selected profile PackageManager." into sc-dev
2021-07-02 18:35:11 +00:00
Ryan Mitchell
82549387c0
Do not update RM config with previous sequence
...
If an application info update is pending and
RM#applyConfigurationToResourcesLocked is called with a config
with an older sequence that RM's current global config, the application
info update should not be applied, nor should the global config be
updated with the older config.
Similarly, when an application is updated and there is a pending
application info change for the previous version of the package,
clear the currently pending application info updates for that package
to prevent the old overlays from being applied on top of the newly
updated application.
Bug: 189100984
Bug: 192449747
Test: toggle wallpaper and observe QS has correct colors
Change-Id: I4bab55960febdae16df7150ccac44e06245e8333
2021-07-02 11:32:22 -07:00
Treehugger Robot
3afa9fae1a
Merge "Allow the kernel to upgrade ASYNC mode processes to SYNC mode." am: fc2745ae54 am: 791e6e8bfc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754778
Change-Id: I97bb4231b8cb7608750a47c196b65fa18b60dcb4
2021-07-02 18:27:26 +00:00
TreeHugger Robot
b6572781e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9b2ed0b134 -s ours am: 9cea629595 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187574
Change-Id: I0da4ce5505cc49a4ba7801e6546c386ad347f127
2021-07-02 18:23:35 +00:00
TreeHugger Robot
69df408e89
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2250fab951 -s ours am: 47f3ea2b20 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187577
Change-Id: Ib6fa1398281c1cb017dbba146d6dcd7833a77137
2021-07-02 18:23:17 +00:00
Mihir Patel
59fe064d75
Merge "Guarding against null pointer exception when setting view structure info for content capture" into sc-dev
2021-07-02 18:22:15 +00:00
TreeHugger Robot
d9405c3495
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9b2ed0b134 -s ours am: 60157279d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187574
Change-Id: I410833cd19d8c9fd23843b988bc6a0560d0280c5
2021-07-02 18:19:21 +00:00
TreeHugger Robot
5e582e6814
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2250fab951 -s ours am: 8e45faf444 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187577
Change-Id: Ida317faed3c6eb4e6b0351509876ccf3df261658
2021-07-02 18:19:12 +00:00
Fabian Kozynski
a1bcc65d45
Fix some paddings in QS
...
QS headers are centered in a row of fixed height. They don't need status
bar padding.
Test: manual
Fixes: 189982925
Change-Id: I085c71d6f58ab26e0a20632dae7f46e4bdc127f8
2021-07-02 14:15:45 -04:00
Treehugger Robot
791e6e8bfc
Merge "Allow the kernel to upgrade ASYNC mode processes to SYNC mode." am: fc2745ae54
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754778
Change-Id: I1afe384f35ab4dee7c8dabff46974a50656dfaa2
2021-07-02 18:15:23 +00:00
TreeHugger Robot
9cea629595
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9b2ed0b134 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187574
Change-Id: I15cefaf98cf1e59bea118c27706af8369738ff1d
2021-07-02 18:08:52 +00:00
TreeHugger Robot
47f3ea2b20
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2250fab951 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187577
Change-Id: I4476ef45f7cb8d5f4a66a153f710503a4daa02a3
2021-07-02 18:08:44 +00:00
TreeHugger Robot
60157279d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9b2ed0b134 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187574
Change-Id: I95ff8cc7306feea29382eb6d750665d2cfcb9bdd
2021-07-02 18:08:11 +00:00
TreeHugger Robot
8e45faf444
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2250fab951 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187577
Change-Id: Ibb51ca21352f0e298a896784e56c6fca6bcc3403
2021-07-02 18:07:53 +00:00
TreeHugger Robot
9b2ed0b134
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-02 18:01:40 +00:00
SongFerngWang
af6fd22efb
Add carrier config for using user data to detect RRC state
...
This configuration allows the framework to use user data
communication to detect RRC state.
Bug: 191321871
Test: build pass and no phone crash.
atest NetworkTypeControllerTest (pass)
Change-Id: Ieffabd25a74faf2038b2e08e956fa16c9efdd3ca
2021-07-03 02:01:15 +08:00
TreeHugger Robot
2250fab951
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-02 18:00:41 +00:00