OSDN Git Service
Nick Kralevich [Fri, 25 Jan 2019 22:43:37 +0000 (14:43 -0800)]
Merge "even more O_CLOEXECs!"
am:
bb5b645454
Change-Id: I8435d69b72dbbbc881bbd43c7a640f3460e5777a
Treehugger Robot [Fri, 25 Jan 2019 22:32:40 +0000 (22:32 +0000)]
Merge "even more O_CLOEXECs!"
Mathieu Chartier [Fri, 25 Jan 2019 22:05:20 +0000 (14:05 -0800)]
Merge "[view compilation] Add separate compilation property"
am:
9343b88b43
Change-Id: I2944873c615c6278507a39a78a5c0dec2f4104df
Mathieu Chartier [Fri, 25 Jan 2019 21:48:38 +0000 (21:48 +0000)]
Merge "[view compilation] Add separate compilation property"
Mathieu Chartier [Thu, 24 Jan 2019 19:13:35 +0000 (11:13 -0800)]
[view compilation] Add separate compilation property
Add separate compilation pm.precompile_layouts property for
precompiled layouts that controls compilation. Previously
this was controlled by view.precompiled_layout_enabled.
Movitation:
Enable view compilation without loading to get extra coverage.
(cherry picked from commit
9e7a5f6078536c7090269303bfbdbbaabda7b056)
Bug:
111895153
Test: manual
Exempt-From-Owner-Approval: Previously approved by owner
Merged-In: Ica79ec076714f76d6ae75d398a2f62d7dd85a6a6
Change-Id: Ica79ec076714f76d6ae75d398a2f62d7dd85a6a6
Nandana Dutt [Fri, 25 Jan 2019 21:17:45 +0000 (13:17 -0800)]
Merge "Follow API guidelines in BugreportManager"
am:
37aee80c76
Change-Id: I2bb33876a9318cc347600726e9277cf71db9c75d
Treehugger Robot [Fri, 25 Jan 2019 21:04:55 +0000 (21:04 +0000)]
Merge "Follow API guidelines in BugreportManager"
Remi NGUYEN VAN [Fri, 25 Jan 2019 20:15:20 +0000 (12:15 -0800)]
Merge "Remove IpClient wrapper"
am:
427f0c36d5
Change-Id: Ia1dfa96b2e929d2481519147dea7f5375aebd53c
Treehugger Robot [Fri, 25 Jan 2019 19:58:36 +0000 (19:58 +0000)]
Merge "Remove IpClient wrapper"
Nick Kralevich [Fri, 25 Jan 2019 18:24:42 +0000 (10:24 -0800)]
even more O_CLOEXECs!
Bug:
120983106
Test: device boots and no obvious problems.
Change-Id: If13fc115187f36a4c577d74a7f138fa62a7316de
Tobias Thierer [Fri, 25 Jan 2019 17:44:49 +0000 (09:44 -0800)]
Merge "Track change of some java.nio.Buffer methods to nonfinal."
am:
38a641d29f
Change-Id: I64062e2c6aafeeb0757ed8ad97666601e93e9735
Joel Fernandes [Fri, 25 Jan 2019 17:40:21 +0000 (09:40 -0800)]
Merge "JankBench: Add Bitmap Upload to list of runnable tests"
am:
9c4b6532b2
Change-Id: I4b085d22ae316b8308f9b4173c73fd55c1ed1c7f
Joel Fernandes [Fri, 25 Jan 2019 17:36:27 +0000 (09:36 -0800)]
Merge "JankBench: Fix execution of incorrect benchmark"
am:
8a52fda1fa
Change-Id: I2032004ccf5e57a0ebb785e9adc0a871750529c4
Tobias Thierer [Fri, 25 Jan 2019 17:22:04 +0000 (17:22 +0000)]
Merge "Track change of some java.nio.Buffer methods to nonfinal."
Suren Baghdasaryan [Fri, 25 Jan 2019 17:19:52 +0000 (09:19 -0800)]
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include"""
am:
113fbed900 -s ours
am skip reason: subject contains skip directive
Change-Id: I068ed1b928689e97c24ac0f48a28c05e6a0c7c09
Joel Fernandes [Fri, 25 Jan 2019 17:14:44 +0000 (17:14 +0000)]
Merge "JankBench: Add Bitmap Upload to list of runnable tests"
Joel Fernandes [Fri, 25 Jan 2019 17:14:15 +0000 (17:14 +0000)]
Merge "JankBench: Fix execution of incorrect benchmark"
Suren Baghdasaryan [Fri, 25 Jan 2019 17:09:02 +0000 (17:09 +0000)]
Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include"""
Nandana Dutt [Fri, 25 Jan 2019 14:31:05 +0000 (14:31 +0000)]
Follow API guidelines in BugreportManager
* Add an executor for callback
* Rename *listener to *callback
* Accept ParcelFileDescriptor.
Not changing the binder interface to accept ParcelFileDescriptor because
there seem to a bug in generated java code for "out"
ParcelFileDescriptors causing compilation errors.
BUG:
111441001
Test: Builds
Change-Id: I9caf91b504eacc3ab6ff23620f1d6ded51caee1a
Suren Baghdasaryan [Fri, 25 Jan 2019 05:23:40 +0000 (05:23 +0000)]
DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include""
This reverts commit
c5e0fdab2c7ff039db26e4d6512bd3d69bdd71d6.
Reason for revert: AOSP is fixed with new vendor image
Change-Id: Iae858f743fbd7e4f58f89b8ba0498f10f6ae0e81
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Remi NGUYEN VAN [Fri, 25 Jan 2019 06:07:26 +0000 (22:07 -0800)]
Merge "Fix IpClientTest"
am:
5e823ab263
Change-Id: I25077d83d0821b9ba1449b7c1c716a44a71f7287
Remi NGUYEN VAN [Fri, 25 Jan 2019 06:07:04 +0000 (15:07 +0900)]
Remove IpClient wrapper
The wrapper was useful to help clients migrate out of the old API, but
all clients are now migrated.
It also conflicts with IpClient in the NetworkStack on Go devices.
Test: Flashed, booted, WiFI works
Bug:
123371264
Change-Id: Ibf04ad9371a07d2c66c478547539ba41c540116f
Remi NGUYEN VAN [Fri, 25 Jan 2019 05:55:08 +0000 (05:55 +0000)]
Merge "Fix IpClientTest"
Christian Wailes [Fri, 25 Jan 2019 02:22:15 +0000 (18:22 -0800)]
Merge "Enables the use of the blastula pool."
am:
33a09948e5
Change-Id: Ibe2aa45a1df74674b82127f0c8588694c39461cf
Christian Wailes [Fri, 25 Jan 2019 02:14:40 +0000 (18:14 -0800)]
Merge "Added Java Language methods for blastula management."
am:
0d9156a9c0
Change-Id: I7833c149e1aac2b0621da6d4f33b4fe800fb0a3e
Christian Wailes [Fri, 25 Jan 2019 02:06:47 +0000 (02:06 +0000)]
Merge "Enables the use of the blastula pool."
Christian Wailes [Fri, 25 Jan 2019 02:06:28 +0000 (02:06 +0000)]
Merge "Added Java Language methods for blastula management."
Pengquan Meng [Fri, 25 Jan 2019 00:53:22 +0000 (16:53 -0800)]
Merge "A get method for NR status in ServiceState"
am:
c09b41cada
Change-Id: Ifc6f7ef34c6e84c361c02493a1afb3dcaa6ae25a
Chris Wailes [Sat, 12 Jan 2019 01:13:00 +0000 (17:13 -0800)]
Enables the use of the blastula pool.
This commit adds the code necessar to initialize and use the blastula
pool during application launching. Highlights include:
* Modifying ZygoteState to allow the creation of blastula session
sockets
* Modified application startup to track if a web view process is being
created.
* Initialization of the blastula pool during Zygote initialization.
* Blastula lifecycle management via reporting pipes and event FDs.
* Launching of applications via the blastula pool.
The creation, maintenance, and use of the blastula pool can be disabled
by setting Zygote.BLASTULA_POOL_ENABLED to false. When this feature is
disabled applications will launch as they did before this patch.
Topic: zygote-prefork
Test: make & flash & launch app & check log message
Bug:
68253328
Change-Id: I46c32ad09400591e866b6c6121d5a9b0332092f3
Merged-In: I46c32ad09400591e866b6c6121d5a9b0332092f3
Chris Wailes [Sat, 12 Jan 2019 01:04:41 +0000 (17:04 -0800)]
Added Java Language methods for blastula management.
This commit adds Java Language wrappers for native blastula management
functions. No changes are made to the application lifecycle.
Topic: zygote-prefork
Test: make & flash & launch apps & check log for messages
Bug:
68253328
Change-Id: Ie9fd0aea2952dbd3baaca22c820e9af700f5e89d
Merged-In: Ie9fd0aea2952dbd3baaca22c820e9af700f5e89d
Lorenzo Colitti [Fri, 25 Jan 2019 00:46:51 +0000 (16:46 -0800)]
Merge changes If54fa3a8,Ie7bd1459
am:
166c3aa030
Change-Id: I492f9fab4b7e69d214911820f7d4c0a00540bac7
Pengquan Meng [Fri, 25 Jan 2019 00:40:48 +0000 (00:40 +0000)]
Merge "A get method for NR status in ServiceState"
Chalard Jean [Fri, 25 Jan 2019 00:36:27 +0000 (16:36 -0800)]
Merge "Fix IPMS tests timeout."
am:
1f9d80f6ee
Change-Id: Ia73f410da8c42e9933dd290deacb82909b4348a6
Lorenzo Colitti [Fri, 25 Jan 2019 00:25:51 +0000 (00:25 +0000)]
Merge changes If54fa3a8,Ie7bd1459
* changes:
Extract network observer code from NetworkManagementService.
Change the signature of notifyInterfaceClassActivity.
Treehugger Robot [Fri, 25 Jan 2019 00:15:50 +0000 (00:15 +0000)]
Merge "Fix IPMS tests timeout."
Jordan Liu [Thu, 24 Jan 2019 23:17:03 +0000 (15:17 -0800)]
Merge "Fix NPE in parcel constructor"
am:
23a6598fe4
Change-Id: I686adb8ab08b17681a10caacca47a926477487d1
Jordan Liu [Thu, 24 Jan 2019 22:50:43 +0000 (22:50 +0000)]
Merge "Fix NPE in parcel constructor"
Nandana Dutt [Thu, 24 Jan 2019 22:35:59 +0000 (14:35 -0800)]
Merge "Add a new bugreport error code"
am:
1bed967833
Change-Id: Id99ec17d82435ac3eb108d2bce56cbca8f1140eb
Treehugger Robot [Thu, 24 Jan 2019 22:21:16 +0000 (22:21 +0000)]
Merge "Add a new bugreport error code"
Pengquan Meng [Fri, 7 Dec 2018 01:48:05 +0000 (17:48 -0800)]
A get method for NR status in ServiceState
Bug:
111453000
Bug:
123099654
Test: build
Merged-In: I07749ff00fc9d53796208ca78721b498ed4c16fd
Change-Id: I07749ff00fc9d53796208ca78721b498ed4c16fd
Dan Albert [Thu, 24 Jan 2019 21:45:19 +0000 (13:45 -0800)]
Merge "Revert "Whitelist packages from VPN lockdown.""
am:
9f73671651
Change-Id: Ibaf799dc2664a6b3b743030da956679a3414ad9d
Dan Albert [Thu, 24 Jan 2019 21:08:46 +0000 (21:08 +0000)]
Merge "Revert "Whitelist packages from VPN lockdown.""
Dan Albert [Thu, 24 Jan 2019 21:05:39 +0000 (21:05 +0000)]
Revert "Whitelist packages from VPN lockdown."
This reverts commit
bb9cef04c5b6699412d43d82bdd31c7a4f692cbc.
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
Jack Yu [Thu, 24 Jan 2019 20:51:27 +0000 (12:51 -0800)]
Merge "Define Nfc statistic data atoms"
am:
961a43eae2
Change-Id: I78c78169f9c75b8ca0dc527d2606cdbc0e15af6f
Treehugger Robot [Thu, 24 Jan 2019 20:25:57 +0000 (20:25 +0000)]
Merge "Define Nfc statistic data atoms"
Josh Gao [Thu, 24 Jan 2019 19:02:17 +0000 (11:02 -0800)]
Merge "ParcelFileDescriptor: fix various ownership mistakes."
am:
8d7976a37e
Change-Id: I4a6b274fcbb09ab52242f00a85630e91c1d87a5a
Jordan Liu [Thu, 24 Jan 2019 18:55:15 +0000 (10:55 -0800)]
Fix NPE in parcel constructor
Instead of calling .getClass().getClassLoader, we use .class to avoid
NPE on the uninitialized PreciseCallState and CallQuality.
Test: manual
Bug:
110107501
Change-Id: I1092122a69aa17235627a22fd973f21d49fc4812
Chenbo Feng [Thu, 24 Jan 2019 18:55:09 +0000 (10:55 -0800)]
Merge "Use delta reads for per uid traffic stats"
am:
48f46ac83c
Change-Id: I17faec2cc2a73e56d0f19abad32154b378857fc4
Josh Gao [Thu, 24 Jan 2019 18:49:03 +0000 (18:49 +0000)]
Merge "ParcelFileDescriptor: fix various ownership mistakes."
Brad Ebinger [Thu, 24 Jan 2019 18:42:58 +0000 (10:42 -0800)]
Merge changes from topics "ut_provision_api", "ims_prov_api_defs"
am:
3fc958475b
Change-Id: I5d3132d6b8c2ae69bb808350dc81786774bdc3ea
Brad Ebinger [Thu, 24 Jan 2019 18:35:59 +0000 (10:35 -0800)]
Define a subset of provisioning integers as public
am:
ad9aec3522
Change-Id: I89c0b4242b68f545cce6043341150d45d4e22643
Ugo Yu [Thu, 24 Jan 2019 18:28:07 +0000 (10:28 -0800)]
Merge "Introduce system APIs for Bluetooth silence mode."
am:
d17b284bdb
Change-Id: Ie772b9b3aa4ac4e4592f20323a0a627c24410dd6
Chenbo Feng [Thu, 24 Jan 2019 18:16:25 +0000 (18:16 +0000)]
Merge "Use delta reads for per uid traffic stats"
Brad Ebinger [Thu, 24 Jan 2019 18:09:14 +0000 (18:09 +0000)]
Merge changes from topics "ut_provision_api", "ims_prov_api_defs"
* changes:
Add new UT provisioning CarrierConfig options
Define a subset of provisioning integers as public
Irina Dumitrescu [Thu, 24 Jan 2019 18:08:07 +0000 (10:08 -0800)]
Merge "Add API for proxy configuration over VPN."
am:
8b5917965d
Change-Id: I647aec5f7678668b8ef7d616150adac1086dbbdd
Treehugger Robot [Thu, 24 Jan 2019 18:08:05 +0000 (18:08 +0000)]
Merge "Introduce system APIs for Bluetooth silence mode."
Treehugger Robot [Thu, 24 Jan 2019 17:52:22 +0000 (17:52 +0000)]
Merge "Add API for proxy configuration over VPN."
Pavel Grafov [Thu, 24 Jan 2019 17:49:42 +0000 (09:49 -0800)]
Merge "Whitelist packages from VPN lockdown."
am:
efc773525c
Change-Id: I329e24f1359a11a72ae9d0a23d2dc5b5de5aa8a7
Pavel Grafov [Thu, 24 Jan 2019 17:34:55 +0000 (17:34 +0000)]
Merge "Whitelist packages from VPN lockdown."
Tobias Thierer [Thu, 24 Jan 2019 16:06:58 +0000 (16:06 +0000)]
Track change of some java.nio.Buffer methods to nonfinal.
Another CL in this topic turns the methods into nonfinal
ones in oder to be able to add covariant method overloads
in java.nio.{Byte,Char,Double,Float,Int,Long,ShortBuffer.
Bug:
71597787
Test: Treehugger
Change-Id: Ife6d5938c932f4e881f8f23c85422c84b6c6a41a
Pavel Grafov [Wed, 5 Dec 2018 10:40:23 +0000 (10:40 +0000)]
Whitelist packages from VPN lockdown.
Bug:
77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Merged-In: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Irina Dumitrescu [Wed, 5 Dec 2018 16:19:47 +0000 (16:19 +0000)]
Add API for proxy configuration over VPN.
Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug:
76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Merged-In: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Lorenzo Colitti [Thu, 24 Jan 2019 04:28:50 +0000 (13:28 +0900)]
Extract network observer code from NetworkManagementService.
This will allow us to use network observers in the NetworkStack
app without duplicating too much code.
Bug:
112869080
Test: atest FrameworksNetTests
Test: builds, boots, wifi works
Change-Id: If54fa3a88110ffa815899d385dbb0d5770abaead
Lorenzo Colitti [Thu, 24 Jan 2019 07:00:25 +0000 (16:00 +0900)]
Change the signature of notifyInterfaceClassActivity.
This simplifies an upcoming refactoring of the notification code.
There is no change in functionality because DC_POWER_STAET_MEDIUM
was never actually used.
Bug:
112869080
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: Ie7bd145961bbd7f2a424be4299e2085da9cddc38
Peter Kalauskas [Thu, 24 Jan 2019 15:26:40 +0000 (07:26 -0800)]
Merge "Allow light HAL to exit if it's a lazy HAL"
am:
1146f76c55
Change-Id: Iaaa50c53383eae94bf07eda443589e647301f248
Peter Kalauskas [Thu, 24 Jan 2019 15:11:02 +0000 (15:11 +0000)]
Merge "Allow light HAL to exit if it's a lazy HAL"
Nicolas Geoffray [Thu, 24 Jan 2019 14:54:57 +0000 (06:54 -0800)]
Merge "Add jar files from the runtime APEX in the whitelist."
am:
4d3a2f95c6
Change-Id: I78c60b3a378298531a7ef219ae0930965ddfb64d
Nicolas Geoffray [Thu, 24 Jan 2019 14:38:17 +0000 (14:38 +0000)]
Merge "Add jar files from the runtime APEX in the whitelist."
Paul Duffin [Thu, 24 Jan 2019 11:32:25 +0000 (03:32 -0800)]
Merge "Include OrgApacheHttpLegacyUpdater unconditionally"
am:
87c1081c42
Change-Id: I724fa0b8b997aa58ce444aa8a929f47af665abed
Lucas Lin [Thu, 24 Jan 2019 11:27:36 +0000 (03:27 -0800)]
Merge "Popup a notification after logging in the captive portal network"
am:
6fa3d391b8
Change-Id: I78321e10014525dfb02da29ee2f3cd4487bf30db
Remi NGUYEN VAN [Thu, 24 Jan 2019 11:13:09 +0000 (20:13 +0900)]
Fix IpClientTest
NetworkStackTests is run with a version of mockito that allows mocking
final methods, which broke mocking of the ConnectivityService.
Test: atest NetworkStackTests
Change-Id: I430fe12216c43a0c4265a504dbefafad37c09291
Paul Duffin [Thu, 24 Jan 2019 11:12:47 +0000 (11:12 +0000)]
Merge "Include OrgApacheHttpLegacyUpdater unconditionally"
Lucas Lin [Thu, 24 Jan 2019 11:06:12 +0000 (11:06 +0000)]
Merge "Popup a notification after logging in the captive portal network"
Pengquan Meng [Thu, 24 Jan 2019 10:51:46 +0000 (02:51 -0800)]
Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef"
am:
54d74bbf06
Change-Id: Ie6cd95f5f6b1569c6b3d84a24ecd69664fcdad67
Pengquan Meng [Thu, 24 Jan 2019 10:35:40 +0000 (10:35 +0000)]
Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef"
Chalard Jean [Thu, 24 Jan 2019 10:34:39 +0000 (19:34 +0900)]
Fix IPMS tests timeout.
The tests used to correctly detect failures but would mostly wait
for timeout instead of succeeding immediately. If timeout were to
happen, that would not have been detected.
Test: atest IpMemoryStoreServiceTest
Change-Id: Ic1e7fcac3020739af7dc3e2c294d0838d8ffc711
Remi NGUYEN VAN [Thu, 24 Jan 2019 10:06:15 +0000 (02:06 -0800)]
Merge "Add additional SystemApi for NetworkStack"
am:
2ffdcc26b0
Change-Id: I2614b1484498ad9d285be5f6628a94983f1561e4
Remi NGUYEN VAN [Thu, 24 Jan 2019 09:55:01 +0000 (09:55 +0000)]
Merge "Add additional SystemApi for NetworkStack"
Nicolas Geoffray [Tue, 22 Jan 2019 20:56:44 +0000 (20:56 +0000)]
Add jar files from the runtime APEX in the whitelist.
Those files moved from /system to the APEX.
Test: m && boots
Change-Id: I68c4c8243dae3eab321da4b0923c1a422d300c10
lucaslin [Thu, 24 Jan 2019 07:55:30 +0000 (15:55 +0800)]
Popup a notification after logging in the captive portal network
Captive portal app will be auto dismissed after user login the
captive portal network. In order to improve the user experience,
popup a notification to notify user that the captive portal
network is connected.
Bug:
113629026
Test: 1.atest FrameworksNetTests:NetworkNotificationManagerTest
2.Connect to a captive portal network and login, check if
there is a notification popup.
Change-Id: Id54d12268e107af2f213c2bb348c5f7908e880f4
Chiachang Wang [Thu, 24 Jan 2019 07:24:47 +0000 (23:24 -0800)]
Merge "Align coding format in data_stall_event.proto"
am:
0d4002db35
Change-Id: I8fbf9ba20fd870143a264216e80e93224f14d0ab
Ugo Yu [Thu, 24 Jan 2019 07:20:44 +0000 (23:20 -0800)]
Merge "Change MetadataListener to a abstract static class"
am:
9d3ce3e55e
Change-Id: Iad82a0046826c548db25c50dcc7cbdb0a90de25a
Jack Yu [Wed, 23 Jan 2019 09:42:54 +0000 (17:42 +0800)]
Define Nfc statistic data atoms
Test: Manual
Bug:
116641110
Change-Id: Ia7e56c159d64804049abf39717e3eeae43373a76
Merged-In: Ib521a9f2d4d098022d973fe6c775231a518f3f49
Chiachang Wang [Thu, 24 Jan 2019 07:11:27 +0000 (07:11 +0000)]
Merge "Align coding format in data_stall_event.proto"
Treehugger Robot [Thu, 24 Jan 2019 07:07:49 +0000 (07:07 +0000)]
Merge "Change MetadataListener to a abstract static class"
Suren Baghdasaryan [Thu, 24 Jan 2019 07:07:37 +0000 (23:07 -0800)]
[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
Suren Baghdasaryan [Thu, 24 Jan 2019 06:57:55 +0000 (06:57 +0000)]
Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency and fix sched_policy include""
Junyu Lai [Thu, 24 Jan 2019 05:24:06 +0000 (21:24 -0800)]
Merge changes from topic "ka05"
am:
b3656c7b1b
Change-Id: I2448348d1501ca50daac87f4c06c120b4de3b2ae
Scott Randolph [Thu, 24 Jan 2019 05:13:57 +0000 (21:13 -0800)]
Merge "Implementation of Remote-SIM."
am:
9f7bc7d616
Change-Id: I0fdd92ff987f49a5528687a84ba3115d3dc24997
Junyu Lai [Thu, 24 Jan 2019 05:06:39 +0000 (05:06 +0000)]
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
Brad Ebinger [Thu, 24 Jan 2019 05:01:57 +0000 (21:01 -0800)]
Merge "Add FEATURE_TELEPHONY_IMS definition"
am:
ad075a3837
Change-Id: Ic1ec5ab56e6f944362032da3c4d1723a99dc8ca3
Scott Randolph [Thu, 24 Jan 2019 05:01:05 +0000 (05:01 +0000)]
Merge "Implementation of Remote-SIM."
Tadashi G. Takaoka [Thu, 24 Jan 2019 04:54:11 +0000 (20:54 -0800)]
Merge "Add generic SelectTest JUnit filter and CoreTestsFilter"
am:
4864bfa722
Change-Id: Iece5642c2909c11d5057dbc630c1723dc3569560
Treehugger Robot [Thu, 24 Jan 2019 04:50:18 +0000 (04:50 +0000)]
Merge "Add FEATURE_TELEPHONY_IMS definition"
Leland Miller [Thu, 24 Jan 2019 04:47:39 +0000 (20:47 -0800)]
Merge "Add part ID reuse to API contract"
am:
d49a6c86f4
Change-Id: I6bddd19ea31e012f340e62e035ca7a0867eb239e
Chiachang Wang [Thu, 24 Jan 2019 04:43:38 +0000 (20:43 -0800)]
Merge "Add NetworkStack into AidToUidMapping"
am:
a3dd0a5050
Change-Id: Ieea0a8b43c5e652ad00132b8b0a9bc9a0362f4e0
Suren Baghdasaryan [Thu, 24 Jan 2019 04:38:14 +0000 (20:38 -0800)]
DO NOT MERGE: Revert "Add libprocessgroup dependency and fix sched_policy include"
This reverts commit
09a29e161f6a240da19d550b267e0ed0f02d37a0.
Reason for revert: Broke AOSP
Change-Id: If056993a8678675ede4c586af1b2a1540e209c5c
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Pengquan Meng [Thu, 24 Jan 2019 04:37:47 +0000 (20:37 -0800)]
Merge "Fix doc of NETWORK_TYPE_NR & add converter"
am:
1abe6aa53f
Change-Id: I60d839b62e9b9365df48c72b040f1f5b2e7b011c
Treehugger Robot [Thu, 24 Jan 2019 04:36:44 +0000 (04:36 +0000)]
Merge "Add generic SelectTest JUnit filter and CoreTestsFilter"
Treehugger Robot [Thu, 24 Jan 2019 04:29:10 +0000 (04:29 +0000)]
Merge "Add part ID reuse to API contract"