Commit Graph

429929 Commits

Author SHA1 Message Date
Jiyong Park
d2f7175e54 [automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master am: 665258fc50 -s ours
am: 625e0eef9f -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 f20f181c53 is in history

Change-Id: Ibca2e86640f2f351bf14ee592372bb6a50b0189e
2019-08-20 03:06:34 -07:00
Jiyong Park
625e0eef9f [automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master
am: 665258fc50 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 f20f181c53 is in history

Change-Id: I2b7a81f27987040d1cc292130a87f60ec2129ffc
2019-08-20 02:46:45 -07:00
Anna Trostanetski
0755524354 Merge "Start platform compat service eariler." into stage-aosp-master am: 4535b04b33
am: f3fe588229

Change-Id: Ib3d6a1df3fd245a7e274bbf89976565dc9dcc577
2019-08-20 02:38:40 -07:00
TreeHugger Robot
665258fc50 Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master 2019-08-20 09:34:38 +00:00
Anna Trostanetski
f3fe588229 Merge "Start platform compat service eariler." into stage-aosp-master
am: 4535b04b33

Change-Id: Ie41d2286e869bf84362919a183f4bad348dfc945
2019-08-20 02:25:13 -07:00
Anna Trostanetski
4535b04b33 Merge "Start platform compat service eariler." into stage-aosp-master 2019-08-20 09:07:33 +00:00
Jiyong Park
0c6dc7b709 glob pattern is used for AIDL files under frameworks/base
This change removes the manullay curated list of AIDL files and replace
them with globs.

In addition, framework-aidl-mappings no longer sets frameworks-defaults
to its src property, but instead uses the several variables like
framework_srcs, framework_aidl_local_include_dirs, etc. to get the
same files/dirs list as the framework.

The variables will eventually be replaced with filegroups when aidl
include paths are better handled (i.e. 'path' property of all filegroups
for a module contributes to the AIDL include paths for all AIDL files in
the module).

Bug: 70046217
Test: m

Merged-In: I59728ed06d66d44bc19bcd8530042c01add5fc2b
(cherry picked from commit 1cc9566ee2)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
2019-08-20 14:06:03 +09:00
Jiyong Park
b1be02cc9c Merge "glob pattern is used for AIDL files under frameworks/base" into qt-dev-plus-aosp
am: 64772e440c

Change-Id: Ie6a21267346bbd65803c1e12caee4256399e79c3
2019-08-19 21:47:48 -07:00
TreeHugger Robot
64772e440c Merge "glob pattern is used for AIDL files under frameworks/base" into qt-dev-plus-aosp 2019-08-20 04:15:15 +00:00
Jordan Liu
a924317c6d Merge "Do not notify SS change with invalid subId" am: 3878f50107 am: 77e183ba6e
am: be27410a12

Change-Id: I44acb8be1b5eb998091948ffffbbf33eb6375096
2019-08-19 17:45:09 -07:00
Jordan Liu
be27410a12 Merge "Do not notify SS change with invalid subId" am: 3878f50107
am: 77e183ba6e

Change-Id: I5ac6db21166a18f64b7cd4a9ae6d0b305c4b9523
2019-08-19 17:34:02 -07:00
Jordan Liu
77e183ba6e Merge "Do not notify SS change with invalid subId"
am: 3878f50107

Change-Id: Ic8e760342a288dc7fe0f38408dea468a9e8c31a6
2019-08-19 17:24:34 -07:00
Jiyong Park
f20f181c53 glob pattern is used for AIDL files under frameworks/base
This change removes the manullay curated list of AIDL files and replace
them with globs.

In addition, framework-aidl-mappings no longer sets frameworks-defaults
to its src property, but instead uses the several variables like
framework_srcs, framework_aidl_local_include_dirs, etc. to get the
same files/dirs list as the framework.

The variables will eventually be replaced with filegroups when aidl
include paths are better handled (i.e. 'path' property of all filegroups
for a module contributes to the AIDL include paths for all AIDL files in
the module).

Bug: 70046217
Test: m

Merged-In: I59728ed06d66d44bc19bcd8530042c01add5fc2b
(cherry picked from commit 1cc9566ee2)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
2019-08-20 09:17:45 +09:00
Jordan Liu
3878f50107 Merge "Do not notify SS change with invalid subId" 2019-08-19 23:57:24 +00: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
95a675ce91 Merge "Remove unused setting" into qt-r1-dev 2019-08-19 21:50:22 +00: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
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
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
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
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
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
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
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
Jordan Liu
d2d614a083 Do not notify SS change with invalid subId
(This is a reupload of ag/8541406.)

If a service state change is reported as a subscription is becoming
invalid (i.e. no longer connected to a phone), the current behavior can
sometimes notify this change to all PhoneStateListeners regardless of
which subId they registered to listen on (namely this happens when the
subscription was attached to the default phone).

This change removes that behavior so that no listeners are notified if
the subscription is invalid.

Test: manually verified on DSDS that when
  1. erasing eSIM when it is default and
  2. removing pSIM when it is default,
  the service state triangle for the other SIM is unaffected
  Also made sure that signal strength is rebroadcast when sub becomes
  valid, so b/138357571 did not show up 5/5 times
Bug: 133140128
Change-Id: I2ba6a971fff4e29ccd2166c381308fcd953f5bc0
Merged-In: I2ba6a971fff4e29ccd2166c381308fcd953f5bc0
2019-08-19 13:24:49 -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
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
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
atrost
8266ae32ba Start platform compat service eariler.
It's needed by ActivityManager and PackageManager.
Also use a constant in Context for the name.

Test: flashed device with ag/9025572 and ag/9204795 and the platfrom
compat was accessible.
Bug: 137769727
Change-Id: Ie1130a3f0bdd1769fe0755db0089702ea64d9db6
Merged-In: Ie1130a3f0bdd1769fe0755db0089702ea64d9db6
2019-08-19 16:10:31 +00: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
Treehugger Robot
8f48cb7e7e Merge "Fix incorrect descriptions under SMS contract" 2019-08-19 14:22:21 +00:00
satayev
67044c622f Merge "Cover framework code in hiddenapi-mappings." am: d39df1d0ac am: ad6cf4a97c
am: efd6f89c7b

Change-Id: I978f68dbc6553b59677b3d6dd1fec543b099f867
2019-08-19 02:57:38 -07:00
satayev
efd6f89c7b Merge "Cover framework code in hiddenapi-mappings." am: d39df1d0ac
am: ad6cf4a97c

Change-Id: Ia14fb9b3d20f0f0304232c816c0546a71ece15a1
2019-08-19 02:47:37 -07:00
satayev
ad6cf4a97c Merge "Cover framework code in hiddenapi-mappings."
am: d39df1d0ac

Change-Id: Ia3d88cfe55d48959d56fd8755d72d1eb4107d0bd
2019-08-19 02:37:47 -07:00
satayev
d39df1d0ac Merge "Cover framework code in hiddenapi-mappings." 2019-08-19 09:13:55 +00:00
Bill Yi
ba8737885f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 4769e819e9 -s ours
am skip reason: subject contains skip directive

Change-Id: Id63143aff6e44df060b8b124f947a12b9555a268
2019-08-18 00:16:06 -07:00
TreeHugger Robot
4769e819e9 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-08-18 06:47:23 +00:00