Commit Graph

382412 Commits

Author SHA1 Message Date
Chiachang Wang
8eebbbf672 Merge "Align coding format in data_stall_event.proto" am: 0d4002db35
am: 5419f98396

Change-Id: Ib0e7c12df86634a0b6dc4e5c441a370c38fa26e2
2019-01-23 23:40:51 -08:00
Ugo Yu
f2d656b438 Merge "Change MetadataListener to a abstract static class" am: 9d3ce3e55e
am: 745c6de6eb

Change-Id: I796dfccf741a1ef6c45d804772415ed198e8e8d1
2019-01-23 23:30:18 -08:00
Chiachang Wang
5419f98396 Merge "Align coding format in data_stall_event.proto"
am: 0d4002db35

Change-Id: I8fbf9ba20fd870143a264216e80e93224f14d0ab
2019-01-23 23:24:47 -08:00
Ugo Yu
745c6de6eb Merge "Change MetadataListener to a abstract static class"
am: 9d3ce3e55e

Change-Id: Iad82a0046826c548db25c50dcc7cbdb0a90de25a
2019-01-23 23:20:44 -08:00
Suren Baghdasaryan
97efff3043 [automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency and fix sched_policy include"" am: 71e3387254 -s ours
am: a57ac928b4 -s ours
am skip reason: subject contains skip directive

Change-Id: I5960a10c6dd4233d3281d0a598819b505923668f
2019-01-23 23:16:32 -08:00
Chiachang Wang
0d4002db35 Merge "Align coding format in data_stall_event.proto" 2019-01-24 07:11:27 +00:00
Treehugger Robot
9d3ce3e55e Merge "Change MetadataListener to a abstract static class" 2019-01-24 07:07:49 +00:00
Suren Baghdasaryan
a57ac928b4 [automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency and fix sched_policy include""
am: 71e3387254 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec09ea850784c0aece711c559f2c4adeb64a5a2b
2019-01-23 23:07:37 -08:00
Suren Baghdasaryan
71e3387254 Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency and fix sched_policy include"" 2019-01-24 06:57:55 +00:00
Junyu Lai
3dea854998 Merge changes from topic "ka05" am: b3656c7b1b
am: 14e51c8a84

Change-Id: I08979872a03c52e933daa39730fd71e998272613
2019-01-23 21:44:11 -08:00
Scott Randolph
6133800a58 Merge "Implementation of Remote-SIM." am: 9f7bc7d616
am: 0fd63d542d

Change-Id: Ie4c28658f6384df624bf8b1d4c1b7b9bed555611
2019-01-23 21:28:45 -08:00
Junyu Lai
14e51c8a84 Merge changes from topic "ka05"
am: b3656c7b1b

Change-Id: I2448348d1501ca50daac87f4c06c120b4de3b2ae
2019-01-23 21:24:06 -08:00
Brad Ebinger
93dd117ee6 Merge "Add FEATURE_TELEPHONY_IMS definition" am: ad075a3837
am: 86999554ea

Change-Id: Ie28a6a11a97dcff35f26dd003d495c14ceb67242
2019-01-23 21:17:22 -08:00
Scott Randolph
0fd63d542d Merge "Implementation of Remote-SIM."
am: 9f7bc7d616

Change-Id: I0fdd92ff987f49a5528687a84ba3115d3dc24997
2019-01-23 21:13:57 -08:00
Tadashi G. Takaoka
53067713f7 Merge "Add generic SelectTest JUnit filter and CoreTestsFilter" am: 4864bfa722
am: 713b4ac76f

Change-Id: I9ba844265852ba3d45a5e514e22f84ea92d84b9d
2019-01-23 21:11:46 -08:00
Junyu Lai
b3656c7b1b Merge changes from topic "ka05"
* changes:
  [KA05] Export keepalive offload api for IpSec Nat-T file descriptor
  [KA01] export SocketKeepalive API for NAT-T keepalive
2019-01-24 05:06:39 +00:00
Brad Ebinger
86999554ea Merge "Add FEATURE_TELEPHONY_IMS definition"
am: ad075a3837

Change-Id: Ic1ec5ab56e6f944362032da3c4d1723a99dc8ca3
2019-01-23 21:01:57 -08:00
Scott Randolph
9f7bc7d616 Merge "Implementation of Remote-SIM." 2019-01-24 05:01:05 +00:00
Leland Miller
c5ceebba02 Merge "Add part ID reuse to API contract" am: d49a6c86f4
am: ea65fcc98a

Change-Id: I4e6546a02cd3614b8c28a8e0b7c1cc6501b1bd93
2019-01-23 21:00:25 -08:00
Chiachang Wang
cc272be339 Merge "Add NetworkStack into AidToUidMapping" am: a3dd0a5050
am: b64b24d127

Change-Id: I7275fb5693463680ff9e07ad15e81e90214c196b
2019-01-23 20:55:03 -08:00
Tadashi G. Takaoka
713b4ac76f Merge "Add generic SelectTest JUnit filter and CoreTestsFilter"
am: 4864bfa722

Change-Id: Iece5642c2909c11d5057dbc630c1723dc3569560
2019-01-23 20:54:11 -08:00
Treehugger Robot
ad075a3837 Merge "Add FEATURE_TELEPHONY_IMS definition" 2019-01-24 04:50:18 +00:00
Leland Miller
ea65fcc98a Merge "Add part ID reuse to API contract"
am: d49a6c86f4

Change-Id: I6bddd19ea31e012f340e62e035ca7a0867eb239e
2019-01-23 20:47:39 -08:00
Pengquan Meng
8a5c3bc6c2 Merge "Fix doc of NETWORK_TYPE_NR & add converter" am: 1abe6aa53f
am: a4e9cec4b3

Change-Id: Ic2bea19fad4095c4f16b34691bbb6ff39546cb19
2019-01-23 20:47:07 -08:00
Chiachang Wang
b64b24d127 Merge "Add NetworkStack into AidToUidMapping"
am: a3dd0a5050

Change-Id: Ieea0a8b43c5e652ad00132b8b0a9bc9a0362f4e0
2019-01-23 20:43:38 -08:00
Suren Baghdasaryan
c5e0fdab2c DO NOT MERGE: Revert "Add libprocessgroup dependency and fix sched_policy include"
This reverts commit 09a29e161f.

Reason for revert: Broke AOSP

Change-Id: If056993a8678675ede4c586af1b2a1540e209c5c
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-24 04:39:34 +00:00
Pengquan Meng
a4e9cec4b3 Merge "Fix doc of NETWORK_TYPE_NR & add converter"
am: 1abe6aa53f

Change-Id: I60d839b62e9b9365df48c72b040f1f5b2e7b011c
2019-01-23 20:37:47 -08:00
Treehugger Robot
4864bfa722 Merge "Add generic SelectTest JUnit filter and CoreTestsFilter" 2019-01-24 04:36:44 +00:00
Treehugger Robot
d49a6c86f4 Merge "Add part ID reuse to API contract" 2019-01-24 04:29:10 +00:00
Chiachang Wang
a3dd0a5050 Merge "Add NetworkStack into AidToUidMapping" 2019-01-24 04:26:44 +00:00
Pengquan Meng
1abe6aa53f Merge "Fix doc of NETWORK_TYPE_NR & add converter" 2019-01-24 04:22:47 +00:00
Chiachang Wang
43b575a185 Align coding format in data_stall_event.proto
Bug: 121185319
Bug: 120452078
Test: Build pass
Change-Id: I660bdf7b9db9966096a7d91f95a4e6570d142c04
2019-01-24 11:41:36 +08:00
Jack Yu
332b5b5786 Merge "Supported data handover in DcTracker/DataConnection/ApnContext" am: 56e1062ce3
am: e055bfa0fa

Change-Id: I3a16a4c3f846114948028d84b82eddb86d6a8d2c
2019-01-23 19:17:22 -08:00
Chen Xu
18aa5e76de Merge "add missing permission check in PhoneStateListener" am: feb7d14aa8
am: b102235018

Change-Id: Ic20401236b22b75d1afe38a49e2897473634e99f
2019-01-23 19:07:19 -08:00
Xiangyu/Malcolm Chen
b4c8ebbef0 Merge "Don't show signal bar of hidden Cellular subscription." am: 2f2a4199fc
am: d521104464

Change-Id: I6b419270163b5fbfb72cc3a66d010782bd6eaf47
2019-01-23 18:54:46 -08:00
Jack Yu
e055bfa0fa Merge "Supported data handover in DcTracker/DataConnection/ApnContext"
am: 56e1062ce3

Change-Id: I46d4f4855ddb99af80a87de03116cb6aa0826a67
2019-01-23 18:48:53 -08:00
Stanley Tng
31b70c2868 Merge "Add Android APIs for Hearing Aids Profile" am: a53fc20213
am: 62a2308550

Change-Id: Id9eccff5eb088f8c2638f242ff1ec6260093c1d4
2019-01-23 18:46:08 -08:00
Stanley Tng
61c1afaa45 Merge "Add 2 new ways to check for Support for Hearing Aids Profile" am: 7982e6f346
am: c144c329ab

Change-Id: If877f5b24f5201efa9448723be90d62f194bf2d6
2019-01-23 18:39:31 -08:00
Jack Yu
56e1062ce3 Merge "Supported data handover in DcTracker/DataConnection/ApnContext" 2019-01-24 02:35:14 +00:00
Christian Wailes
80db7b7783 Merge "Refactored ZygoteConnection.Arguments to ZygoteArguments." am: 3a46c1b4ce
am: 3926f08109

Change-Id: I173c9cd671a9683793eee0c5053e3e8855ec0cf8
2019-01-23 18:34:18 -08:00
Christian Wailes
a13898896c Merge "Code cleanup in ZygoteInit." am: 889648df40
am: 6b7e35d216

Change-Id: I654fcdb478dfae98d78b0353e068122d115dd2c5
2019-01-23 18:28:46 -08:00
Christian Wailes
a1f14e0912 Merge "Code cleanup to conform to style guide / linter." am: f5ff8f0661
am: 420eec4f52

Change-Id: If4634a4d8026c1df1c581b120527926fbee68a0e
2019-01-23 18:23:25 -08:00
Chen Xu
b102235018 Merge "add missing permission check in PhoneStateListener"
am: feb7d14aa8

Change-Id: I7ccfab5789cd2adf654d6d593cec22f496a9a767
2019-01-23 18:22:29 -08:00
Xiangyu/Malcolm Chen
d521104464 Merge "Don't show signal bar of hidden Cellular subscription."
am: 2f2a4199fc

Change-Id: I3fa6a5b7baec94bd085a86fb4cce5062c5fd1a0f
2019-01-23 18:15:38 -08:00
Stanley Tng
62a2308550 Merge "Add Android APIs for Hearing Aids Profile"
am: a53fc20213

Change-Id: Ib91747b26a3fffbfe4a87377fde7cbc01f50d0c1
2019-01-23 18:09:19 -08:00
Stanley Tng
c144c329ab Merge "Add 2 new ways to check for Support for Hearing Aids Profile"
am: 7982e6f346

Change-Id: I81f18175e61d5c1d1b213d5a112a8c70621e0d07
2019-01-23 18:03:26 -08:00
Chen Xu
feb7d14aa8 Merge "add missing permission check in PhoneStateListener" 2019-01-24 02:00:55 +00:00
Christian Wailes
3f076da22b Merge "Implemented native functions and types for blastula management." am: 5222bf368b
am: c5cc5e525c

Change-Id: I4eb03e2d0592aefa196be7f96687aa4f155c0022
2019-01-23 17:56:00 -08:00
Christian Wailes
3926f08109 Merge "Refactored ZygoteConnection.Arguments to ZygoteArguments."
am: 3a46c1b4ce

Change-Id: Id702f32a15ad134b6d694d0fc53e1721094f78dd
2019-01-23 17:50:58 -08:00
Ugo Yu
d9a0a7fd55 Change MetadataListener to a abstract static class
Bug: 121051445
Test: build pass
Change-Id: I8148d13d2eb0899d54817197ae0be236e2914e47
2019-01-24 09:48:20 +08:00