Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
65dce9a9ac Merge "Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 am: 17eca29097" into rvc-d1-dev-plus-aosp 2020-06-16 02:46:10 +00:00
TreeHugger Robot
74459cd347 Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 am: 1c53e8cfa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833622

Change-Id: Id55aa72be9d5978ef60f4c84df0093b04f9822e1
 2020-06-16 02:45:59 +00:00
TreeHugger Robot
8f32641794 Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 am: 17eca29097 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833622

Change-Id: I3369c7309a8a765dc43a3325998a7469d9b8792f
 2020-06-16 02:45:59 +00:00
TreeHugger Robot
cd8eece1c1 Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 am: 1c53e8cfa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833622

Change-Id: I14c76c58d66ff900db24963fcbde70f708ead5eb
 2020-06-16 02:45:52 +00:00
TreeHugger Robot
17eca29097 Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833622

Change-Id: Ib4e8b352befe546a4202e1e40de93e1ddfd40e7b
 2020-06-16 02:33:46 +00:00
TreeHugger Robot
1c53e8cfa4 Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833622

Change-Id: If197fadede3db5ebe2d08dafb7bae1d60d68b4fb
 2020-06-16 02:33:40 +00:00
Lucas Dupin
5df123f1d5 Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 am: 3220105b8c am: 6775877e68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11801909

Change-Id: I7cfb4f369b7d43cc8b1243d9690b2fa26463d538
 2020-06-16 02:21:16 +00:00
TreeHugger Robot
f40975ee76 Merge "Add tron metrics to track iorap." into rvc-dev 2020-06-16 02:20:26 +00:00
Lucas Dupin
8bc26d6eee Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 am: c3a46cd1b0 am: 2b790d8696 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11801909

Change-Id: Iffc6737f72b763755dcc6d2541d333742a286061
 2020-06-16 02:20:25 +00:00
Lucas Dupin
2baff607b1 Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 am: c3a46cd1b0 am: 489a4e4282 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11801909

Change-Id: I62bfe8694f281dbe01384e125074adefd9372fd7
 2020-06-16 02:20:14 +00:00
Jeffrey Huang
ceaa76970f Add FrameworkStatsdTest to mts 
Bug: 154652564
Test: m mts && mts-tradefed run mts-statsd
Change-Id: Iefb2a96f6cb2663146c7a1578c08ce82c43160f4
 2020-06-15 19:13:57 -07:00
Lucas Dupin
489a4e4282 Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 am: c3a46cd1b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11801909

Change-Id: I29097d0bacc2eb70e16931a6dd9f30f3c014ea4c
 2020-06-16 02:12:29 +00:00
Lucas Dupin
6775877e68 Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 am: 3220105b8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11801909

Change-Id: I5eaf7b54e34441e65f3df05af8b7e42b24cacaaa
 2020-06-16 02:12:23 +00:00
Lucas Dupin
2b790d8696 Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 am: c3a46cd1b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11801909

Change-Id: Ieef3f89d661006b16f07a982dab2fac6de2046ca
 2020-06-16 02:12:04 +00:00
Lucas Dupin
3220105b8c Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11801909

Change-Id: Id61bafc97ed37d373b7ab57d799a10e004b726f1
 2020-06-16 02:02:14 +00:00
Lucas Dupin
c3a46cd1b0 Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11801909

Change-Id: Ib0b24779116589a98b5ccf2f4db4c65442ac6446
 2020-06-16 02:02:05 +00:00
Chiachang Wang
4d2791b1a6 Test extra info sent to NetworkMonitor 
Test extra info sent to NetworkMonitor correctly if network
agent is created through new NetworkAgent constructor without
legacy network info taken as parameter.

Bug: 156173829
Test: atest FrameworkNetTests
Merged-In: I4f827664c528bea30cc957a0a617dd37693f4460
Change-Id: I4f827664c528bea30cc957a0a617dd37693f4460
 2020-06-16 01:57:46 +00:00
Yunfan Chen
c02a5ac5bb Revert "Revert "Remove IME surface when occured in multi-window mode"" 
This reverts commit 2a38a35622.

Reason for revert: The original CL was reverted for b/158836294 and it turned out to be innocent. Re-land the CL.

Bug: b/155660756

Change-Id: Iada83e80059e7cb9566bb7ad4e4c9909b4ed794a
 2020-06-16 01:54:41 +00:00
Lucas Dupin
df9b697804 Merge "Hook up media player resumption to UI" into rvc-dev 2020-06-16 01:46:40 +00:00
Benedict Wong
26d2378f5b Set correct owner UID for VPN agentConnect() 
This commit changes agentConnect to set the owner UID as the mOwnerUid
field instead of the Binder.getCallingUid().

Binder.getCallingUid() can return incorrect results for platform VPNs,
as agentConnect() is called under a clean calling UID.

Additionally, this relaxes the ownerUid sanitization check to allow a
VPN network's owner to see it's own ownership information.

Vpn.mOwnerUid is guaranteed to be correct, as all VPNs MUST have called
prepareInternal() at some previous point, which sets mOwnerUid as the
package's UID (or SYSTEM_UID if this is legacy VPN).

Bug: 150135470
Test: CTS tests showing ownership information
Merged-In: Ic979dad73983d722365849fbfb0becfd432b894c
Change-Id: Ic979dad73983d722365849fbfb0becfd432b894c
(cherry picked from commit e29bf99a7f)
 2020-06-16 01:42:48 +00:00
Chiachang Wang
98d80dbf0d Merge "Test extra info sent to NetworkMonitor" am: 4f45ccd46b am: dbcfe36229 am: 43b8b17a1e am: 0f59df5b76 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: I860a85ee44c7fb3d6707bdae637c52c6796324b1
 2020-06-16 01:29:27 +00:00
Chiachang Wang
0f59df5b76 Merge "Test extra info sent to NetworkMonitor" am: 4f45ccd46b am: dbcfe36229 am: 43b8b17a1e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: I52edaf94601620b8b22030e586ae9de0742b3303
 2020-06-16 01:16:41 +00:00
Automerger Merge Worker
732d39aa8e Merge "Merge "Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 am: b3202b67a7" into rvc-d1-dev-plus-aosp am: 25fe3dcc6b" into rvc-qpr-dev-plus-aosp 2020-06-16 01:02:55 +00:00
Chiachang Wang
43b8b17a1e Merge "Test extra info sent to NetworkMonitor" am: 4f45ccd46b am: dbcfe36229 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: Ice048df853589411ee1f1c935b929994af1c525b
 2020-06-16 01:02:52 +00:00
Automerger Merge Worker
69785f6603 Merge "Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 am: b3202b67a7" into rvc-d1-dev-plus-aosp am: 25fe3dcc6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872631

Change-Id: I0365f536747e35d1db33b436e5f12e8134622d78
 2020-06-16 01:02:49 +00:00
TreeHugger Robot
4a65242bee Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 am: b3202b67a7 am: 7a12bb2179 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872631

Change-Id: Ia69bef6911a1732a63513202290cb57ee3df08cc
 2020-06-16 01:02:42 +00:00
Matt Casey
4c1f295cb4 Dismiss screenshot UI on back gesture/button. 
Bug: 157504199
Test: Verify dismissal on screenshot button & gesture. Try rotating
      phone before back, verify it still dismisses.
Change-Id: Ib2f909bd68e596bc23c7d8deab2863a81dd81049
 2020-06-15 21:02:27 -04:00
TreeHugger Robot
003e114d40 Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 am: 30028c2d84 am: 7bfb2874d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872631

Change-Id: I22baebab26c8a67ee7b018aab8065ef38624bf8c
 2020-06-16 01:02:23 +00:00
Chiachang Wang
dbcfe36229 Merge "Test extra info sent to NetworkMonitor" am: 4f45ccd46b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: If48de0d3fe326d72170b13ec6a9477dfc8dc48ff
 2020-06-16 00:52:01 +00:00
Automerger Merge Worker
25fe3dcc6b Merge "Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 am: b3202b67a7" into rvc-d1-dev-plus-aosp 2020-06-16 00:51:32 +00:00
TreeHugger Robot
7a12bb2179 Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 am: b3202b67a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872631

Change-Id: I941e7d6d98f91a2a0329b398e606277d22cb7211
 2020-06-16 00:51:21 +00:00
TreeHugger Robot
a4e181b45f Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 am: b3202b67a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872631

Change-Id: I8a2152b4ec51d3732fdc6f5a361f13f13b67c913
 2020-06-16 00:51:20 +00:00
TreeHugger Robot
7bfb2874d7 Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 am: 30028c2d84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872631

Change-Id: Iad4c01c328a12dfdf4a729ac64ea57b686221a7a
 2020-06-16 00:51:17 +00:00
Beth Thibodeau
30516e1f6c Screen record a11y fixes 
Audio switch: add content description, minimum width, and fix weights so
that is visible in largest display size
Make panel scrollable so that everything can be viewed in landscape mode

Fixes: 153606009
Fixes: 153521498
Fixes: 153619008
Fixes: 153617098
Test: manual

Change-Id: I72a5299b57eb4d03795db5dcd4892dca2d681f84
 2020-06-15 20:42:04 -04:00
TreeHugger Robot
30028c2d84 Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872631

Change-Id: Ia3af7cab252cff3c30183f2d5423348edf3a7af9
 2020-06-16 00:40:01 +00:00
TreeHugger Robot
b3202b67a7 Merge "Dump MediaDeviceManager state" into rvc-dev am: 87963f6207 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872631

Change-Id: I47939ff9a23da9729d0f88e874a9b21011791451
 2020-06-16 00:39:41 +00:00
Chiachang Wang
4f45ccd46b Merge "Test extra info sent to NetworkMonitor" 2020-06-16 00:38:58 +00:00
Automerger Merge Worker
d6d5f0ea8c Merge "Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f am: e6b481af3c am: 710a3796ac" into rvc-qpr-dev-plus-aosp 2020-06-16 00:30:40 +00:00
Hall Liu
e2321ec626 Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f am: e6b481af3c am: 710a3796ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871446

Change-Id: I5c98ce61a81a8d69bc1ce3afed0489db40520555
 2020-06-16 00:30:30 +00:00
Automerger Merge Worker
7b97e8a670 Merge "Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f am: 62c85e3efc am: c3c70b44a8" into rvc-qpr-dev-plus-aosp 2020-06-16 00:30:23 +00:00
Hall Liu
9bd409d3fb Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f am: 62c85e3efc am: c3c70b44a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871446

Change-Id: If0f257a2d534318cbdb914a21ef8167365f681d4
 2020-06-16 00:30:07 +00:00
Hall Liu
f9dc5df78c Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f am: 62c85e3efc am: 689c7a6d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871446

Change-Id: I42199f7cecfe19fbea30c3b7f1d33c4c611f89bd
 2020-06-16 00:29:58 +00:00
TreeHugger Robot
87963f6207 Merge "Dump MediaDeviceManager state" into rvc-dev 2020-06-16 00:25:53 +00:00
Hall Liu
710a3796ac Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f am: e6b481af3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871446

Change-Id: Ie34c207be6a58962a7f4f5691ca8b5284d7a057a
 2020-06-16 00:19:12 +00:00
Hall Liu
c3c70b44a8 Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f am: 62c85e3efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871446

Change-Id: I1641a887878fd9673807e92aa7c2ab731294b6cd
 2020-06-16 00:19:11 +00:00
Hall Liu
689c7a6d99 Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f am: 62c85e3efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871446

Change-Id: I220d01745a99435dccbb5e9a24b9104e1b114299
 2020-06-16 00:18:59 +00:00
Hall Liu
e6b481af3c Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871446

Change-Id: I280f2ef928d4e1b377ace8a9f1979a7fe4c1086c
 2020-06-16 00:04:53 +00:00
Hall Liu
62c85e3efc Merge "Add more docs about location permission" into rvc-dev am: 3263b53e2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871446

Change-Id: I4a267a8c06a85015a3ccb31505f94f929e96e58a
 2020-06-16 00:04:39 +00:00
Lucas Dupin
84f5a0e713 Hook up media player resumption to UI 
Fixes: 157926365
Fixes: 158691042
Test: atest MediaControlPanelTest
Test: atest MediaDataCombineLatestTest
Test: atest MediaDeviceManagerTest
Test: atest MediaTimeoutListenerTest
Test: with media playing:
      - got from keyguard to QS
      - got from keyguard to QQS
      - got from QQS to QS
      repeat after media timeout
Change-Id: I3f6ccd69b06c328ce528959b868eb194fbf4ca9e
 2020-06-15 17:02:39 -07:00
Automerger Merge Worker
b8976268e8 Merge "Merge "Revert "decouple Bubble from NotificationEntry"" into rvc-dev am: 8f8af41376 am: 00e32c11b9" into rvc-d1-dev-plus-aosp am: 2fa84a365f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872875

Change-Id: Ia850d305667f990a601f5b138635d9050eb4a87c
 2020-06-15 23:52:45 +00:00