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
Treehugger Robot
073943f0fd Merge "Make LaunchPerformanceBase and UnitTestSuiteBuilder as APIs" 2020-06-15 14:56:40 +00:00
Steve Elliott
c744ad246e Merge "Fix occasional bad placement of Conversation header" into rvc-dev 2020-06-15 14:56:14 +00:00
Riddle Hsu
455e968bde Merge "Set pillar box bounds in fixed orientation display" into rvc-dev am: 541633e3d6 am: 8407a8ccac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862406

Change-Id: I42dc4ba9b282a6a3a239caef6d5d729c9b5d04f8
 2020-06-15 14:47:51 +00:00
Automerger Merge Worker
5bf19b3848 Merge "[automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 -s ours am: 302db9a7d2 -s ours" into rvc-d1-dev-plus-aosp 2020-06-15 14:47:22 +00:00
Riddle Hsu
e2e919ab0a Merge "Set pillar box bounds in fixed orientation display" into rvc-dev am: 541633e3d6 am: 03914e642b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862406

Change-Id: I66e9c86aa58cccb4fa33a7bc1c7cd63d63eec258
 2020-06-15 14:47:09 +00:00
Riddle Hsu
4c2be9ab66 Merge "Set pillar box bounds in fixed orientation display" into rvc-dev am: 541633e3d6 am: 8407a8ccac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862406

Change-Id: I20dd0e404677650bf6b36275ce57c0016080067a
 2020-06-15 14:47:07 +00:00
TreeHugger Robot
86d5237bc6 [automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 -s ours am: 302db9a7d2 -s ours 
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: I83a36beb23a55e7e1623334ebf5c55ad00cc9505
 2020-06-15 14:47:03 +00:00
TreeHugger Robot
ed87d2e4e7 [automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 am: d2862c2335 -s ours 
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: If90413d031b20585ffe953912da48a08f675d7fe
 2020-06-15 14:47:02 +00:00
TreeHugger Robot
b7005bfc04 [automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 -s ours am: 302db9a7d2 -s ours 
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: Id3760784169f3002368261d433114a15ea40fa1d
 2020-06-15 14:46:56 +00:00
Riddle Hsu
8407a8ccac Merge "Set pillar box bounds in fixed orientation display" into rvc-dev am: 541633e3d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862406

Change-Id: Ibd9b1a764508f84378f53a775045e3ef9939fe94
 2020-06-15 14:40:43 +00:00
Riddle Hsu
03914e642b Merge "Set pillar box bounds in fixed orientation display" into rvc-dev am: 541633e3d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862406

Change-Id: Idba37654b3bf3298b8a7c8a6a2e122aab450af0c
 2020-06-15 14:40:42 +00:00
Riddle Hsu
541633e3d6 Merge "Set pillar box bounds in fixed orientation display" into rvc-dev 2020-06-15 14:36:32 +00:00
TreeHugger Robot
d2862c2335 Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854549

Change-Id: I80e819b2ebf61fe30369150faf8b90f555cd8851
 2020-06-15 14:34:43 +00:00
TreeHugger Robot
302db9a7d2 [automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 -s ours 
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: Ief2583763c80137ec7eb367a65ac2991f7eff016
 2020-06-15 14:34:21 +00:00
TreeHugger Robot
3616fd6330 Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev 2020-06-15 14:21:43 +00:00
Automerger Merge Worker
84ae0be723 Merge "Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: c27675f8b3" into rvc-d1-dev-plus-aosp am: 5a2ef80874 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11655738

Change-Id: I30fd2f599440ce6c4db4c35564b380384cb7db6f
 2020-06-15 14:06:18 +00:00
Automerger Merge Worker
98d77d5fc1 Merge "Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: 51b76ac0de" into rvc-d1-dev-plus-aosp am: 32c0e63cee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11655738

Change-Id: Ifd4fa6d880eefb7240a71c914faf3369beb7a501
 2020-06-15 14:05:45 +00:00
Automerger Merge Worker
75bbc3847e Merge "Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: c27675f8b3 am: a5ed2de44f" into rvc-qpr-dev-plus-aosp 2020-06-15 14:05:39 +00:00
Automerger Merge Worker
4eca192443 Merge "Merge "Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: d68ed29966" into rvc-d1-dev-plus-aosp am: 4bf3b5c7a6" into rvc-qpr-dev-plus-aosp 2020-06-15 14:05:27 +00:00
Nathalie Le Clair
4b1a05256f Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: c27675f8b3 am: a5ed2de44f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11655738

Change-Id: I0798acae4d7f012e705731d2633628136b0e18a1
 2020-06-15 14:05:24 +00:00
Automerger Merge Worker
8d63c1b369 Merge "Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: d68ed29966" into rvc-d1-dev-plus-aosp am: 4bf3b5c7a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11659722

Change-Id: Ib2116264e37315c8f37becafd0830ffa0307213f
 2020-06-15 14:05:20 +00:00
Automerger Merge Worker
d49d95472d Merge "Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: d68ed29966 am: c1ee7c1845" into rvc-qpr-dev-plus-aosp 2020-06-15 14:05:15 +00:00
Tiger Huang
a53ea9c5e4 Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: d68ed29966 am: c1ee7c1845 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11659722

Change-Id: I247f6ca30aaaa450450f9faaf6772da740e18151
 2020-06-15 14:05:00 +00:00
Tiger Huang
5efe5cb4f0 Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: 258bbc2f4d am: ecb767f84d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11659722

Change-Id: I311148d566aea0c42e5bfc4ef8c78f82c9fc03e2
 2020-06-15 14:04:50 +00:00
Automerger Merge Worker
5a2ef80874 Merge "Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: c27675f8b3" into rvc-d1-dev-plus-aosp 2020-06-15 13:54:45 +00:00
Automerger Merge Worker
32c0e63cee Merge "Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: 51b76ac0de" into rvc-d1-dev-plus-aosp 2020-06-15 13:54:41 +00:00
Nathalie Le Clair
ba18e0ce73 Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: c27675f8b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11655738

Change-Id: Ia6b29eb639869846b21085b79b168ee1a0498ccf
 2020-06-15 13:54:38 +00:00
Automerger Merge Worker
4bf3b5c7a6 Merge "Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: d68ed29966" into rvc-d1-dev-plus-aosp 2020-06-15 13:54:29 +00:00
Nathalie Le Clair
245d569aad Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: 51b76ac0de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11655738

Change-Id: Ia59880cefce29f9c546d6f055ca9e6bfbd96c76a
 2020-06-15 13:54:29 +00:00
Tiger Huang
46a1a1c067 Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: d68ed29966 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11659722

Change-Id: Ib68fc85f78d866b1a7addd20b888e7cd2d8d040f
 2020-06-15 13:54:22 +00:00
Tiger Huang
ecb767f84d Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: 258bbc2f4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11659722

Change-Id: I5d87f1e87308ca9dfc130314bc0907db8d432298
 2020-06-15 13:54:21 +00:00
Nathalie Le Clair
a5ed2de44f Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 am: c27675f8b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11655738

Change-Id: I25e00a4432fe44a099e22e1b7ae9dbe8a0d50189
 2020-06-15 13:54:14 +00:00
Tiger Huang
c1ee7c1845 Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 am: d68ed29966 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11659722

Change-Id: I95ff8acf09b3d5e51018ba890ca1716a9aa2a42d
 2020-06-15 13:54:05 +00:00
Nathalie Le Clair
51b76ac0de Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11655738

Change-Id: I462c649a8f35b6afa7ddc66bc72c356766b8dfb8
 2020-06-15 13:36:57 +00:00
Nathalie Le Clair
c27675f8b3 Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev am: eeff674786 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11655738

Change-Id: Id538e133c86fbbe89563553fe043936a4f0b06fb
 2020-06-15 13:36:53 +00:00
Tiger Huang
d68ed29966 Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11659722

Change-Id: I8c0f48dd744a91fb33373edbeed573688eab355e
 2020-06-15 13:36:31 +00:00
Tiger Huang
258bbc2f4d Merge "Don't notify dead client about losing control" into rvc-dev am: edd4859399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11659722

Change-Id: I2f6dbc6cf8ee18e6b7234b2ed73f227189e4b9f6
 2020-06-15 13:36:30 +00:00
Nathalie Le Clair
eeff674786 Merge "Get HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED from overlay" into rvc-dev 2020-06-15 13:36:05 +00:00
Tiger Huang
edd4859399 Merge "Don't notify dead client about losing control" into rvc-dev 2020-06-15 13:21:43 +00:00
Marvin Ramin
6896a53257 CEC: Prevent overwriting volume control Settings 
Prevent overwriting CEC volume control Settings value when disabling CEC
globally.

This prevents an issue where disabling and re-enabling CEC will leave
volume control disabled, as the Settings value gets set to false when
disabling CEC.

Bug: 158307190
Test: atest HdmiControlService
Change-Id: I34d24185f284dfb89c02f39a3c456045d1ddd227
 2020-06-15 15:19:55 +02:00
Hungming Chen
f8722adfd6 [BOT.11] BpfCoordinator could be disabled by device config 
Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb
 2020-06-15 21:16:26 +08:00
Hungming Chen
60cd8991d0 [BOT.8] Dump BPF offload information in dumpsys 
$ adb shell dumpsys tethering
BPF offload:
  Polling started
  Stats provider registered
  Upstream quota: {rmnet_data2=9223372036854775807}
  Forwarding stats:
    12(rmnet_data2) - ForwardedStats(rxb: 1065, rxp: 5, txb: 0, txp: 0)
  Forwarding rules:
    [wlan1]: iif(iface) oif(iface) v6addr srcmac dstmac
      12(rmnet_data2) 31(wlan1) /2401:e180:8831:77ae:a900:a03b:41fb..

Bug: 150736748
Test: Enable tethering on mobile data and check dumpsys tethering
Change-Id: I95ea3050d92f3ba8136a63cd399d3450d183c8dc
 2020-06-15 21:14:28 +08:00
Andrew Walbran
558aeff56f Merge "Add keylayout for SnakeByte iDroid:con" am: 99ce8c4945 am: f8b50f034a am: ae0e270ff7 am: 6c86a253b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331927

Change-Id: I7bf7e8b99af98ba9ea2d29225158f1300a046dd7
 2020-06-15 13:10:23 +00:00
Automerger Merge Worker
61831de19b Merge "Merge "Add logging on sharesheet displayList to help investigate issue that icons launch different apps unexpectedly." into rvc-dev am: 3fb94d8e9d am: 86efe0fa3f am: 0504083ad2" into rvc-qpr-dev-plus-aosp 2020-06-15 13:10:07 +00:00
TreeHugger Robot
4f21b5210b Merge "Add logging on sharesheet displayList to help investigate issue that icons launch different apps unexpectedly." into rvc-dev am: 3fb94d8e9d am: ca36d7b761 am: a5852a842e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859967

Change-Id: I12f1acb409185ce8b9ee0434806afcb465411930
 2020-06-15 13:09:53 +00:00
TreeHugger Robot
1f89f96d82 Merge "Add logging on sharesheet displayList to help investigate issue that icons launch different apps unexpectedly." into rvc-dev am: 3fb94d8e9d am: 86efe0fa3f am: 0504083ad2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859967

Change-Id: Ia5fef6417caa87b6b124e0723d1bb8e22b350626
 2020-06-15 13:09:43 +00:00
TreeHugger Robot
bc78b9ddf3 Merge "Add logging on sharesheet displayList to help investigate issue that icons launch different apps unexpectedly." into rvc-dev am: 3fb94d8e9d am: 86efe0fa3f am: 0fa463656b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859967

Change-Id: I9e7046e02d8a719a3392645049774e17412add6a
 2020-06-15 13:09:39 +00:00
Andrew Walbran
6c86a253b1 Merge "Add keylayout for SnakeByte iDroid:con" am: 99ce8c4945 am: f8b50f034a am: ae0e270ff7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331927

Change-Id: I3b56f7e2ccd8e7de80cf323549f250d3167afd9f
 2020-06-15 12:46:01 +00:00
Andrew Walbran
ae0e270ff7 Merge "Add keylayout for SnakeByte iDroid:con" am: 99ce8c4945 am: f8b50f034a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331927

Change-Id: I0b3ef96e98ff8ee11d3b807c98f24c2dff8e8ac2
 2020-06-15 12:45:33 +00:00
TreeHugger Robot
0504083ad2 Merge "Add logging on sharesheet displayList to help investigate issue that icons launch different apps unexpectedly." into rvc-dev am: 3fb94d8e9d am: 86efe0fa3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859967

Change-Id: I76a4c3169630ed58d5b91d347886d1e09cbd0d48
 2020-06-15 12:45:32 +00:00