Commit Graph

649936 Commits

Author SHA1 Message Date
Treehugger Robot
46c57c5f19 Merge "Request location info in UnderlyingNetworkListener" am: ef226bcd35 am: bdaa82e1eb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754781

Change-Id: I80900537044a9e05e78a21d80772ec46fadba6e5
2021-07-02 08:36:24 +00:00
Treehugger Robot
bdaa82e1eb Merge "Request location info in UnderlyingNetworkListener" am: ef226bcd35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754781

Change-Id: Id43603597e3ebd064d75b30cf805142f6aae1304
2021-07-02 08:20:30 +00:00
Treehugger Robot
ef226bcd35 Merge "Request location info in UnderlyingNetworkListener" 2021-07-02 07:59:48 +00:00
Benedict Wong
89e8793b3a Request location info in UnderlyingNetworkListener
This change ensures that the UnderlyingNetworkListener receives
location-sensitive fields in order to proxy the location sensitive
fields in the VcnTransportInfo

Bug: 192587440
Test: manual tests
Test: atest FrameworksVcnTests
Change-Id: Id42ae2e373d909424c3f213412ea4731ee01fa2b
2021-07-02 03:13:20 +00:00
Tianjie Xu
c6cc6d355e Merge "Acquire the wake lock to ensure RoR isn't delayed" am: 9dbd3ea3e0 am: c8eebe97e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753600

Change-Id: I72f16350e2d703e20c1c3a4f9b2054ed02700bfa
2021-07-02 01:35:53 +00:00
Treehugger Robot
7ad93b5cd2 [automerger skipped] Merge "Hopefully fix validatekeymaps mac build." am: 65cef543b4 am: 83aa7c349c -s ours
am skip reason: Merged-In Ibdcdfab2c5160644b9b9453e56a76d47f6d2b9b4 with SHA-1 4bfc6508ab is already in history

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

Change-Id: Ibee7d5afe9f16cea52b2accc7aaec23cd2e8e55c
2021-07-02 01:35:38 +00:00
Tianjie Xu
873b437983 Merge "Add shell command to query if lskf is captured" am: 5b435f9cbc am: d148f09646
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1740613

Change-Id: Ib952412b1990264d123be2ddae4c34c606d9bec3
2021-07-02 01:34:53 +00:00
Tianjie Xu
c8eebe97e7 Merge "Acquire the wake lock to ensure RoR isn't delayed" am: 9dbd3ea3e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753600

Change-Id: Idf0dce1c0c85f37a8c329180b4c06639ab970a05
2021-07-02 01:25:30 +00:00
Treehugger Robot
83aa7c349c Merge "Hopefully fix validatekeymaps mac build." am: 65cef543b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753601

Change-Id: I9848a71f464cb9c0ee127559f67e88f0f96b2d92
2021-07-02 01:24:55 +00:00
Tianjie Xu
d148f09646 Merge "Add shell command to query if lskf is captured" am: 5b435f9cbc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1740613

Change-Id: Ie7bf57a177dc4fb6eaea0ecbc7b72716ed6240a1
2021-07-02 01:23:47 +00:00
Hans Boehm
13945aadb5 Merge "Add dalvik.vm.force-java-zygote-fork-loop" am: a8540eebc3 am: 12f589735b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747950

Change-Id: If85e48ca5743b5fd1bf8e1b36fbcb1372ec1b1f3
2021-07-01 23:36:19 +00:00
Hans Boehm
12f589735b Merge "Add dalvik.vm.force-java-zygote-fork-loop" am: a8540eebc3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747950

Change-Id: I153aaaec36f1031cf952b94d9cd4291c5d3997d5
2021-07-01 23:14:57 +00:00
TreeHugger Robot
142aef1bb8 Merge "Use the current padding instead of the default one during layout." into sc-dev am: f45161efa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15173051

Change-Id: I003d7a49ff079175ef6752430691557970fd0029
2021-07-01 22:37:01 +00:00
Tianjie Xu
9dbd3ea3e0 Merge "Acquire the wake lock to ensure RoR isn't delayed" 2021-07-01 22:26:04 +00:00
TreeHugger Robot
f45161efa1 Merge "Use the current padding instead of the default one during layout." into sc-dev 2021-07-01 22:22:29 +00:00
Beth Thibodeau
9df438f0d2 Merge "Fade in expanded media player in landscape" into sc-dev am: 37e2de8f64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15174572

Change-Id: I07ff29f89c5e3aef6b823510d8a5264e8d1db73a
2021-07-01 21:56:20 +00:00
Beth Thibodeau
37e2de8f64 Merge "Fade in expanded media player in landscape" into sc-dev 2021-07-01 21:50:45 +00:00
TreeHugger Robot
ca58abc4a9 Merge "Add READ_PRIVILEGED_PHONE_STATE to dialer" into sc-dev am: b3075bc5dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14908986

Change-Id: Iba83b43c726dfb1fd834a74922fe8c44751f0c6a
2021-07-01 21:48:37 +00:00
Hasini Gunasinghe
ba23dd5d79 Merge "Update keystore-statsd proxy for logging RkpPoolStats atom." into sc-dev am: 4def4bdfcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15160850

Change-Id: I4cb64e3cdb17a4f836ab1a5a4ca1de18fdef7d3d
2021-07-01 21:47:35 +00:00
TreeHugger Robot
b3075bc5dc Merge "Add READ_PRIVILEGED_PHONE_STATE to dialer" into sc-dev 2021-07-01 21:45:06 +00:00
Hasini Gunasinghe
4def4bdfcb Merge "Update keystore-statsd proxy for logging RkpPoolStats atom." into sc-dev 2021-07-01 21:36:22 +00:00
Alexander Dorokhine
d5add214c1 Merge "Move libicing.so out of /usr/lib, into the appsearch apex." into sc-dev am: 5a26c6b39c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003778

Change-Id: I89f648295a7480e15e385f278ef739338c4b142a
2021-07-01 21:30:57 +00:00
TreeHugger Robot
928e3d36f6 Merge "Fix logging bug" into sc-dev am: 8f17b10c48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15111911

Change-Id: I702720e4337a2abd803b715361576d3694d948f5
2021-07-01 21:30:15 +00:00
Alexander Dorokhine
5a26c6b39c Merge "Move libicing.so out of /usr/lib, into the appsearch apex." into sc-dev 2021-07-01 21:29:56 +00:00
TreeHugger Robot
8f17b10c48 Merge "Fix logging bug" into sc-dev 2021-07-01 21:13:07 +00:00
Curtis Belmonte
4bb2e87120 Merge "Fix BiometricPrompt layout for UDFPS in landscape" into sc-dev am: 9dff4b394f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175065

Change-Id: I509f3317f9cb99acd574d6d1521fd72d6ec61f47
2021-07-01 21:08:53 +00:00
Treehugger Robot
65cef543b4 Merge "Hopefully fix validatekeymaps mac build." 2021-07-01 21:00:32 +00:00
Curtis Belmonte
9dff4b394f Merge "Fix BiometricPrompt layout for UDFPS in landscape" into sc-dev 2021-07-01 20:57:29 +00:00
Tianjie Xu
5b435f9cbc Merge "Add shell command to query if lskf is captured" 2021-07-01 20:50:55 +00:00
Curtis Belmonte
dccc693e40 Merge "Don't attempt caching for BiometricManager.Strings" into sc-dev am: 80cfdd10db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177519

Change-Id: I840e33ed338a39f3af229c6f91606b5b4647d27d
2021-07-01 20:49:10 +00:00
Anna Zappone
e3843cfc33 Merge "Update a11y content descriptions" into sc-dev am: a3d48ea4b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15130710

Change-Id: I92256f41eee3bb92d2bec47ebf463aecf1db8569
2021-07-01 20:48:53 +00:00
TreeHugger Robot
466f24c128 Merge "Fix allowlisting restricted permissions for secondary users on app upgrade." into sc-dev am: c7db0e6f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15166603

Change-Id: If671560be38151a10020004ecf77ecee596bd290
2021-07-01 20:48:22 +00:00
Curtis Belmonte
80cfdd10db Merge "Don't attempt caching for BiometricManager.Strings" into sc-dev 2021-07-01 20:47:01 +00:00
Anna Zappone
a3d48ea4b3 Merge "Update a11y content descriptions" into sc-dev 2021-07-01 20:44:49 +00:00
TreeHugger Robot
c7db0e6f3a Merge "Fix allowlisting restricted permissions for secondary users on app upgrade." into sc-dev 2021-07-01 20:35:06 +00:00
Josh Tsuji
85e0a3fe57 Merge "Update light reveal effect on wake/sleep so that the screen off animation works too." into sc-dev am: 71812c219c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15162037

Change-Id: I61f2ea4d2c0de90cdbd375406bc4418bf4937332
2021-07-01 20:25:30 +00:00
Miranda Kephart
86121fa466 Merge "Restore non-scrolling UI on long screenshots crash" into sc-dev am: 7ab8dd98ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161573

Change-Id: I3f838425d78c965f09f91dc557e3531bd47e3c4d
2021-07-01 20:24:48 +00:00
Hans Boehm
a8540eebc3 Merge "Add dalvik.vm.force-java-zygote-fork-loop" 2021-07-01 20:17:35 +00:00
Josh Tsuji
71812c219c Merge "Update light reveal effect on wake/sleep so that the screen off animation works too." into sc-dev 2021-07-01 20:16:01 +00:00
Miranda Kephart
7ab8dd98ba Merge "Restore non-scrolling UI on long screenshots crash" into sc-dev 2021-07-01 20:07:19 +00:00
Lucas Dupin
2419f26e91 Merge "Fix wallpaper showing on AOD" into sc-dev am: 6b9f1a5e2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15176330

Change-Id: Ia2f075016a90dbc43e7e7ba664d44e3ef08e490b
2021-07-01 19:18:14 +00:00
Lucas Dupin
6b9f1a5e2a Merge "Fix wallpaper showing on AOD" into sc-dev 2021-07-01 19:15:18 +00:00
Evan Severson
79d83e88d9 Merge "Catch Illegal argument exception" into sc-dev am: b04401df4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15174877

Change-Id: I773a6ae0998476845f6027d708bb99d65fb4fbb6
2021-07-01 19:14:41 +00:00
Hongwei Wang
71d9bd0bb3 Merge "Fix the round corner and crop issue after auto-enter-pip" into sc-dev am: 4f2967f788
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15176303

Change-Id: I8b63358dda686b13dffeae672182b55d4f51441c
2021-07-01 19:14:09 +00:00
Dave Mankoff
0df00754ff Merge "Don't fire pending remote input when is phone locked." into sc-dev am: e48c3b65f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15174955

Change-Id: I27193d14f36ec3376880c72e078eb4362bc349b8
2021-07-01 19:13:46 +00:00
Hangyu Kuang
a7ae3bd5d4 Merge "Revert^2 "trancoding: lazy-start transcoding service"" into sc-dev am: 3f24b510a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15164824

Change-Id: Ieb4cbdfe4e9dc4ccbdb0c5d850f1c948aae50b1b
2021-07-01 19:12:41 +00:00
Evan Severson
b04401df4e Merge "Catch Illegal argument exception" into sc-dev 2021-07-01 19:12:38 +00:00
Hongwei Wang
4f2967f788 Merge "Fix the round corner and crop issue after auto-enter-pip" into sc-dev 2021-07-01 19:12:26 +00:00
Dave Mankoff
e48c3b65f1 Merge "Don't fire pending remote input when is phone locked." into sc-dev 2021-07-01 19:12:21 +00:00
Hangyu Kuang
3f24b510a8 Merge "Revert^2 "trancoding: lazy-start transcoding service"" into sc-dev 2021-07-01 19:03:10 +00:00