Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430,861 Commits 3 Branches 0 Tags
2300a4ec629c496009bc66a0576205a106333940
Commit Graph

430861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
2300a4ec62 Merge "Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 am: 709b0a4a74" into qt-qpr1-dev-plus-aosp 2019-08-19 22:23:17 +00:00
Kevin Chyn
3667ad74bc Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 
am: 709b0a4a74

Change-Id: Ib0f2717c125b37ca5327bb1662d668d39632ae5e
 2019-08-19 15:22:06 -07:00
Kevin Chyn
fb1d9de34d Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 
am: d670c6c1f8

Change-Id: Ib27536f48a565716b43b49d7a69f968009087f13
 2019-08-19 15:21:44 -07:00
Kevin Chyn
709b0a4a74 Merge "Remove unused setting" into qt-r1-dev 
am: 95a675ce91

Change-Id: Ia72e5c6625f8213c807966312550111bcbdcb767
 2019-08-19 15:08:45 -07:00
Kevin Chyn
d670c6c1f8 Merge "Remove unused setting" into qt-r1-dev 
am: 95a675ce91

Change-Id: I5d1d1d70a0936c4542d26f7f7216a2d6a66eb1e6
 2019-08-19 15:08:27 -07:00
Yifan Hong
aaa6279a4e Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 am: 8eec5d9ee4 am: ba28a3a57e 
am: caa60f0b28

Change-Id: I810be1081f5d7687c4b00ac7168b2f5591a47965
 2019-08-19 14:57:29 -07:00
Kevin Chyn
95a675ce91 Merge "Remove unused setting" into qt-r1-dev 2019-08-19 21:50:22 +00:00
Siarhei Vishniakou
6bc154fc2c Merge "[automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours am: 2a051239f9 -s ours am: 3385b207b0 -s ours 
am: df94a3cfaf -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: Ibefcad65e8b857c4e42436fc88837b4aa23812a6
 2019-08-19 14:47:08 -07:00
Roy Want
7209e34cb7 Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev am: 4e027572e3 
am: 612c4b08ec

Change-Id: I880548c5d75aa158f927241e61f6749a3b7229e1
 2019-08-19 14:41:41 -07:00
Nate Fischer
98edba2fcf Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea am: b4defd6887 
am: a93efb8218

Change-Id: Iab055851d1b32e6bab3f22a74f92776f9dd3124c
 2019-08-19 14:33:01 -07:00
Nate Fischer
105de6c194 Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea am: 6201d28952 
am: 38b8fca177

Change-Id: I204f0428686095550a8f7f34c9a815d57597e455
 2019-08-19 14:22:45 -07:00
Yifan Hong
caa60f0b28 Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 am: 8eec5d9ee4 
am: ba28a3a57e

Change-Id: I7f2840e00f6236ec1dd31e88140c9c55cfe2f072
 2019-08-19 14:21:10 -07:00
Roy Want
b7a647f676 Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev am: 4e027572e3 
am: ac9c2723c6

Change-Id: Iaf1d5181e45768c749ed208331bf04812c94c15d
 2019-08-19 14:19:48 -07:00
Nate Fischer
095e1c1328 Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea am: 6201d28952 
am: e838a0353f

Change-Id: I7042cc96f8dfd5151e41c4af780c7f420ec6896b
 2019-08-19 14:08:07 -07:00
Android Build Merger (Role)
df94a3cfaf Merge "[automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours am: 2a051239f9 -s ours am: 3385b207b0 -s ours am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history" into qt-r1-dev-plus-aosp 2019-08-19 21:03:02 +00:00
Roy Want
ac9c2723c6 Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev 
am: 4e027572e3

Change-Id: Ic1ad369b2571259930e080574d7ce4c994940308
 2019-08-19 14:02:46 -07:00
Siarhei Vishniakou
54668d4af1 [automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours am: 2a051239f9 -s ours 
am: 3385b207b0 -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: I9b6150751262a8a89611b07258f48d526c5d2b05
 2019-08-19 14:02:24 -07:00
Yifan Hong
ba28a3a57e Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 
am: 8eec5d9ee4

Change-Id: I97342299680ab5e89ad6fb53c7a24c469c30a4d3
 2019-08-19 14:01:18 -07:00
Android Build Merger (Role)
f5c967fd7e Merge "Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev am: 4aa0aeadff am: 245fc50ce7" into qt-qpr1-dev-plus-aosp 2019-08-19 21:01:03 +00:00
Mihir Patel
76e4c0b930 Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev am: 4aa0aeadff 
am: 245fc50ce7

Change-Id: I72862cf615af157c4df9edf8b8121d819625ebb5
 2019-08-19 14:00:04 -07:00
Roy Want
612c4b08ec Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev 
am: 4e027572e3

Change-Id: I735b6990bd78dd1c2dbf7dc042af0e5e2d559c6d
 2019-08-19 13:59:50 -07:00
Mihir Patel
6b365322d4 Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev am: 4aa0aeadff 
am: c1b765e744

Change-Id: Ie4ed8565ad223fb751dded6414288ae619cd8aaa
 2019-08-19 13:58:27 -07:00
Alex Light
92ac76bb7d Merge "Add agent startup-attach" into qt-dev-plus-aosp am: 74f191c782 
am: 25abf4d99a

Change-Id: I4caa4c4af263544bf76278397e67b283c2f6ef40
 2019-08-19 13:54:04 -07:00
Nate Fischer
a93efb8218 Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea 
am: b4defd6887

Change-Id: Ied6c508484e068eceaea5b27276fb97f4a25ec9a
 2019-08-19 13:48:53 -07:00
Siarhei Vishniakou
3385b207b0 [automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours 
am: 2a051239f9 -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: I9af92a9410bfee55e238631e1e27245e5bbab129
 2019-08-19 13:47:25 -07:00
Yifan Hong
8eec5d9ee4 Merge "BatteryService: scheduleUpdate asynchronously" 
am: 238a04ef59

Change-Id: I77add2054b9f9e1c19067dfa169476a9e9d583f6
 2019-08-19 13:47:09 -07:00
Jordan Liu
9fd89f3700 Merge "Do not notify SS change with invalid subId" into qt-qpr1-dev 
am: 81c33b98f2

Change-Id: I065d9965e135f5a29d750232409a2f1fcd7c2499
 2019-08-19 13:46:56 -07:00
Nate Fischer
38b8fca177 Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea 
am: 6201d28952

Change-Id: I699c12ad87091c94601971ac56bf46966f16e740
 2019-08-19 13:43:41 -07:00
Nate Fischer
e838a0353f Merge "WebView: prettyprint docs" into qt-dev am: 20f2f0b5ea 
am: 6201d28952

Change-Id: I06fdaa6d8f5b5d1cc75263338c8bb56da9bcca51
 2019-08-19 13:41:11 -07:00
TreeHugger Robot
4e027572e3 Merge "Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)" into qt-r1-dev 2019-08-19 20:37:12 +00:00
Mihir Patel
c1b765e744 Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev 
am: 4aa0aeadff

Change-Id: I5fbd4bbc0d08b0a43c12d36b2b172e2df1edb64a
 2019-08-19 13:37:01 -07:00
Mihir Patel
245fc50ce7 Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev 
am: 4aa0aeadff

Change-Id: Iadf1c43fc5b38ab432e4bc2f47d50dd911f725ed
 2019-08-19 13:34:24 -07:00
Alex Light
25abf4d99a Merge "Add agent startup-attach" into qt-dev-plus-aosp 
am: 74f191c782

Change-Id: I45f82e0c1efa8d312971cb84ab51888c4595498f
 2019-08-19 13:29:49 -07:00
Siarhei Vishniakou
2a051239f9 [automerger skipped] Merge changes Ie18bce98,I1c600bc2 
am: 778250f57f -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: Id34c9f958d43b6a0abf2ea61de64b591ca22cf3f
 2019-08-19 13:25:47 -07:00
SongFerng Wang
bfc0a8de45 Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev 
am: 052a08bcda

Change-Id: I48b5d230015a4d61556fda1f4bd65681136c12d7
 2019-08-19 13:24:58 -07:00
Nate Fischer
b4defd6887 Merge "WebView: prettyprint docs" into qt-dev 
am: 20f2f0b5ea

Change-Id: I30af1cf394092fa83c376e96f9d174bd456b6026
 2019-08-19 13:22:57 -07:00
Nate Fischer
6201d28952 Merge "WebView: prettyprint docs" into qt-dev 
am: 20f2f0b5ea

Change-Id: Iad51d33c434a42272c448ba7a807bdcbe6cb51d0
 2019-08-19 13:22:49 -07:00
Jordan Liu
81c33b98f2 Merge "Do not notify SS change with invalid subId" into qt-qpr1-dev 2019-08-19 20:16:33 +00:00
Yifan Hong
238a04ef59 Merge "BatteryService: scheduleUpdate asynchronously" 2019-08-19 20:14:15 +00:00
Mihir Patel
4aa0aeadff Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev 2019-08-19 20:11:44 +00:00
Treehugger Robot
778250f57f Merge changes Ie18bce98,I1c600bc2 
* changes:
  Add keylayout for Xbox One USB controller
  Keylayout for xbox controllers
 2019-08-19 19:57:35 +00:00
TreeHugger Robot
20f2f0b5ea Merge "WebView: prettyprint docs" into qt-dev 2019-08-19 19:06:32 +00:00
SongFerng Wang
052a08bcda Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev 2019-08-19 18:26:03 +00:00
Siarhei Vishniakou
4fef274c01 Add keylayout for Xbox One USB controller 
We are currently missing the key layout for the Xbox One USB controller
with the following meta information:
vendor 045e, product 02ea

This layout was copied from product 02d1.

Also fix the mappings of the middle buttons to generate "select - mode -
start", similar to what has already been done for the other xbox
controllers in ag/4836521 and ag/3162575

Bug: 132451971
Bug: 133514907
Bug: 139512030
Test: tested using custom app. CTS tests will be added later.

Change-Id: Ie18bce987b512211d3e91bd1f7334afe11d83cf8
Merged-In: Ie18bce987b512211d3e91bd1f7334afe11d83cf8
 2019-08-19 13:21:15 -05:00
Siarhei Vishniakou
9d81ccc929 Keylayout for xbox controllers 
Add layout for Xbox elite controller

Test: tested with a custom app
Bug: 132451971
Bug: 139512030
Change-Id: I1c600bc2c41db9d79d7a4e184ef41abe2b5f860e
Merged-In: I1c600bc2c41db9d79d7a4e184ef41abe2b5f860e
 2019-08-19 13:18:05 -05:00
TreeHugger Robot
74f191c782 Merge "Add agent startup-attach" into qt-dev-plus-aosp 2019-08-19 17:32:25 +00:00
Leland Miller
b6d51f117b Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183 am: 4e16f07ddf 
am: ecd1d67584

Change-Id: I4193a4f3f6b10d41c4ae3049d6d9267fc9daa778
 2019-08-19 08:36:26 -07:00
Leland Miller
ecd1d67584 Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183 
am: 4e16f07ddf

Change-Id: I0e8a4e7cbe1bfc34f03b57256f6eed48f56ccdcc
 2019-08-19 08:26:30 -07:00
Leland Miller
4e16f07ddf Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e 
am: 6ef5b6c183

Change-Id: I602eafce4122063c07e6ff09f61f5ca43f47a0f4
 2019-08-19 08:14:28 -07:00
Leland Miller
6ef5b6c183 Merge "Fix incorrect descriptions under SMS contract" 
am: 8f48cb7e7e

Change-Id: I9b8659b91e72608100efbba3d36cb0b86066feb3
 2019-08-19 08:02:38 -07:00