Commit Graph

379858 Commits

Author SHA1 Message Date
Pengquan Meng
28b34fac22 Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef"
am: 54d74bbf06

Change-Id: Ie6cd95f5f6b1569c6b3d84a24ecd69664fcdad67
2019-01-24 02:51:46 -08:00
Pengquan Meng
54d74bbf06 Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef" 2019-01-24 10:35:40 +00:00
Remi NGUYEN VAN
aee43d2387 Merge "Add additional SystemApi for NetworkStack"
am: 2ffdcc26b0

Change-Id: I2614b1484498ad9d285be5f6628a94983f1561e4
2019-01-24 02:06:15 -08:00
Remi NGUYEN VAN
2ffdcc26b0 Merge "Add additional SystemApi for NetworkStack" 2019-01-24 09:55:01 +00: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
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
14e51c8a84 Merge changes from topic "ka05"
am: b3656c7b1b

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

Change-Id: I0fdd92ff987f49a5528687a84ba3115d3dc24997
2019-01-23 21:13:57 -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
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
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
bb1ff15ca9 Add RIL_RADIO_TECHNOLOGY_NR to IntDef
Bug: 121263364
Bug: 123099654
Test: build
Merged-In: I4bec8de081efe1020409351afa284fd2e69a25b5
Change-Id: I4bec8de081efe1020409351afa284fd2e69a25b5
2019-01-23 20:25:43 -08: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
e055bfa0fa Merge "Supported data handover in DcTracker/DataConnection/ApnContext"
am: 56e1062ce3

Change-Id: I46d4f4855ddb99af80a87de03116cb6aa0826a67
2019-01-23 18:48:53 -08:00
Jack Yu
56e1062ce3 Merge "Supported data handover in DcTracker/DataConnection/ApnContext" 2019-01-24 02:35:14 +00: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
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
Christian Wailes
6b7e35d216 Merge "Code cleanup in ZygoteInit."
am: 889648df40

Change-Id: I236f851fe38c16e5f0ad54d64b6ff81bcb090b9e
2019-01-23 17:46:44 -08:00
Xiangyu/Malcolm Chen
2f2a4199fc Merge "Don't show signal bar of hidden Cellular subscription." 2019-01-24 01:45:07 +00:00
Christian Wailes
420eec4f52 Merge "Code cleanup to conform to style guide / linter."
am: f5ff8f0661

Change-Id: If6c04c711b328c114d04ea8b4aa01414a715b7a2
2019-01-23 17:42:24 -08:00
Christian Wailes
c5cc5e525c Merge "Implemented native functions and types for blastula management."
am: 5222bf368b

Change-Id: I833eef9f333bd7b5bf552beebfdc7cc483aeec26
2019-01-23 17:38:23 -08:00
Treehugger Robot
a53fc20213 Merge "Add Android APIs for Hearing Aids Profile" 2019-01-24 01:37:05 +00:00
Treehugger Robot
7982e6f346 Merge "Add 2 new ways to check for Support for Hearing Aids Profile" 2019-01-24 01:34:24 +00:00
Chris Wailes
068b86e943 Merge "Add the blastula pool sockets to the Zygote whitelist."
am: e22f160c2e

Change-Id: I96e522b9a168d32589c3fc178c53adad338b7bb5
2019-01-23 17:32:34 -08:00
Christian Wailes
b9293d20d5 Merge "Added mitigation for b/122921367"
am: 80c398b74c

Change-Id: I29c437ba51ff3f4cc90671a0581f41a70581d5a8
2019-01-23 17:26:10 -08:00
Chris Wailes
5adc8fa3e0 Merge "Removed false positives from the greylist."
am: 5d33fe94e4

Change-Id: I499062c50b5e0ab5ad2e28f1968b2790adee028e
2019-01-23 17:21:27 -08:00
Christian Wailes
3a46c1b4ce Merge "Refactored ZygoteConnection.Arguments to ZygoteArguments." 2019-01-24 01:13:41 +00:00
Christian Wailes
889648df40 Merge "Code cleanup in ZygoteInit." 2019-01-24 01:13:20 +00:00
Christian Wailes
f5ff8f0661 Merge "Code cleanup to conform to style guide / linter." 2019-01-24 01:12:46 +00:00
Christian Wailes
5222bf368b Merge "Implemented native functions and types for blastula management." 2019-01-24 01:12:19 +00:00
Treehugger Robot
e22f160c2e Merge "Add the blastula pool sockets to the Zygote whitelist." 2019-01-24 01:11:58 +00:00