OSDN Git Service
Kyeongkab.Nam [Fri, 1 Feb 2019 20:22:49 +0000 (12:22 -0800)]
Merge "Fix the wrong assignment" am:
cf74daba15
am:
f8e84f8434
Change-Id: Ib97f79abfe85c7bb2b94aaa44a573d1cba15c329
Kyeongkab.Nam [Fri, 1 Feb 2019 19:27:57 +0000 (11:27 -0800)]
Merge "Fix the wrong assignment"
am:
cf74daba15
Change-Id: I1ddab12828584676054e57d317600797564b0921
Treehugger Robot [Fri, 1 Feb 2019 16:44:36 +0000 (16:44 +0000)]
Merge "Fix the wrong assignment"
Eran Messeri [Fri, 1 Feb 2019 13:12:47 +0000 (05:12 -0800)]
Merge "Add owners for KeyChain code" am:
0f9319ed1b
am:
d7fd57224d
Change-Id: I30f0d7060cb61a26efcddb5cd4e2119907a4f63e
Eran Messeri [Fri, 1 Feb 2019 13:03:21 +0000 (05:03 -0800)]
Merge "Add owners for KeyChain code"
am:
0f9319ed1b
Change-Id: Id8528c3b1c499cdab621479d27e52969f22ac22f
Eran Messeri [Fri, 1 Feb 2019 12:51:51 +0000 (12:51 +0000)]
Merge "Add owners for KeyChain code"
Kyeongkab.Nam [Fri, 1 Feb 2019 08:34:55 +0000 (00:34 -0800)]
Merge "Fix to register the receiver for all users" am:
c72866785a
am:
29a43554ab
Change-Id: I6210f0c4a8705752a4597a04cf45f5f5709e0c9f
Kyeongkab.Nam [Fri, 1 Feb 2019 08:26:38 +0000 (00:26 -0800)]
Merge "Fix to register the receiver for all users"
am:
c72866785a
Change-Id: I931c857ad5c205df9cd244af6828d1d3abbd2afa
Kyeongkab.Nam [Fri, 1 Feb 2019 02:51:02 +0000 (11:51 +0900)]
Fix the wrong assignment
the format value is erroneously assigned to sinkChannelMask.
Therefore, it modify to assign the format value to sinkFormat.
Test: manual
Change-Id: Iaa2f2cef0f1448a432279483b23e0057ae3ed381
Treehugger Robot [Fri, 1 Feb 2019 08:08:32 +0000 (08:08 +0000)]
Merge "Fix to register the receiver for all users"
Holly Jiuyu Sun [Fri, 1 Feb 2019 04:43:46 +0000 (20:43 -0800)]
Merge "Handle permission check for multi-active SIMs devices." am:
2638587995
am:
44eb96b47c
Change-Id: Ied8f6ef53a701547f4c921e3b401838c5facf205
Holly Jiuyu Sun [Fri, 1 Feb 2019 04:34:20 +0000 (20:34 -0800)]
Merge "Handle permission check for multi-active SIMs devices."
am:
2638587995
Change-Id: Ibc492399e3b083fe1781eae706ea00416e48429e
Holly Jiuyu Sun [Fri, 1 Feb 2019 04:16:50 +0000 (04:16 +0000)]
Merge "Handle permission check for multi-active SIMs devices."
Eric Holk [Fri, 1 Feb 2019 03:17:13 +0000 (19:17 -0800)]
Merge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING" am:
1cb64c6a85
am:
d8ec417dd6
Change-Id: I12273695d8318900d325436ebb252b287517c367
Eric Holk [Fri, 1 Feb 2019 03:06:56 +0000 (19:06 -0800)]
Merge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING"
am:
1cb64c6a85
Change-Id: I881a6acd8b68be987ceadf1dfc303aedb53a211a
Treehugger Robot [Fri, 1 Feb 2019 02:50:31 +0000 (02:50 +0000)]
Merge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING"
Jordan Liu [Fri, 1 Feb 2019 01:47:54 +0000 (17:47 -0800)]
Merge "Fix read/write parcel of CallAttributes" am:
ed3af9f960
am:
f5e381d4b6
Change-Id: Ib316593d772ca2305d70a61df49b7e0e8f5eacf8
Jordan Liu [Fri, 1 Feb 2019 01:39:31 +0000 (17:39 -0800)]
Merge "Fix read/write parcel of CallAttributes"
am:
ed3af9f960
Change-Id: I8706e6e4364e70728c124af6ed44780996e6faf5
Jordan Liu [Fri, 1 Feb 2019 01:20:53 +0000 (01:20 +0000)]
Merge "Fix read/write parcel of CallAttributes"
Brad Ebinger [Thu, 31 Jan 2019 23:43:52 +0000 (15:43 -0800)]
Merge "Add new ImsException to better handle ImsService errors" am:
3811aba3a4
am:
0bfbfe5646
Change-Id: Ic3a0806cc5e1d6efb0c2d175fda77cd57466072a
Brad Ebinger [Thu, 31 Jan 2019 23:34:13 +0000 (15:34 -0800)]
Merge "Add new ImsException to better handle ImsService errors"
am:
3811aba3a4
Change-Id: I006528d4295339a1d06a2f93f3000fbe1b279e73
Brad Ebinger [Thu, 31 Jan 2019 23:26:57 +0000 (23:26 +0000)]
Merge "Add new ImsException to better handle ImsService errors"
Peter Kalauskas [Thu, 31 Jan 2019 22:30:22 +0000 (14:30 -0800)]
Merge "Update android.hidl.manager-V1.0-java to V1.2" am:
b9e216c2b6
am:
e20b0fb677
Change-Id: I19d522d2ea25549f92de9494f4e60b4af2ebe34b
Peter Kalauskas [Thu, 31 Jan 2019 22:19:35 +0000 (14:19 -0800)]
Merge "Update android.hidl.manager-V1.0-java to V1.2"
am:
b9e216c2b6
Change-Id: Ic66313072193f54835cc6aa0be7f6b98367f52ee
Peter Kalauskas [Thu, 31 Jan 2019 22:05:47 +0000 (22:05 +0000)]
Merge "Update android.hidl.manager-V1.0-java to V1.2"
Peter Kalauskas [Tue, 22 Jan 2019 23:41:59 +0000 (15:41 -0800)]
Update android.hidl.manager-V1.0-java to V1.2
Test: Manual
Bug:
123307146
Change-Id: I8dcd291c187af2cb20fd9a8f09bd55e75a2762e1
Eric Holk [Mon, 28 Jan 2019 23:16:52 +0000 (15:16 -0800)]
[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING
PrecompiledLayoutTest makes sure that layouts generated by the viewcompiler are
equivalent to inflating from the resource XML file. We'll want to run these
tests when making changes to the viewcompiler.
Bug:
111895153
Test: atest
Change-Id: Iffa6f0f01c3f43d43feaabd1a5cd36be76650975
Jordan Liu [Wed, 30 Jan 2019 23:35:44 +0000 (15:35 -0800)]
Fix read/write parcel of CallAttributes
Fixes:
123363462
Test: manual
Change-Id: I947005d43930ad136e5d6933c950d0f27f8fbadd
Adrian Roos [Thu, 31 Jan 2019 19:56:04 +0000 (11:56 -0800)]
Merge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true" am:
f9ec508556
am:
942dedc59c
Change-Id: I17dc3064c3205ac16a92553f59947e12a7d51b77
Adrian Roos [Thu, 31 Jan 2019 19:42:50 +0000 (11:42 -0800)]
Merge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true"
am:
f9ec508556
Change-Id: I459e7bb01b0b72c792b8af621331a2e43718fc9e
Treehugger Robot [Thu, 31 Jan 2019 19:25:59 +0000 (19:25 +0000)]
Merge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true"
Remi NGUYEN VAN [Thu, 31 Jan 2019 15:28:41 +0000 (07:28 -0800)]
Merge "Compile CaptivePortalLogin as system_current" am:
a5a7af11d7
am:
2891385ae3
Change-Id: Ia87b8a20fed2cc1c09b15a27ed35be2c2a964b61
Howard Chen [Thu, 31 Jan 2019 15:11:33 +0000 (07:11 -0800)]
Merge "Add the DynamicAndroid Service" am:
0b2057db02
am:
683251a1e2
Change-Id: Ia23e042273c8ab1a9d6de5e393b126794822cb5f
Remi NGUYEN VAN [Thu, 31 Jan 2019 15:11:28 +0000 (07:11 -0800)]
Merge "Compile CaptivePortalLogin as system_current"
am:
a5a7af11d7
Change-Id: Ib2675171c491228bf01105919a1167b7996cb2e7
Remi NGUYEN VAN [Thu, 31 Jan 2019 15:01:49 +0000 (15:01 +0000)]
Merge "Compile CaptivePortalLogin as system_current"
Howard Chen [Thu, 31 Jan 2019 14:52:18 +0000 (06:52 -0800)]
Merge "Add the DynamicAndroid Service"
am:
0b2057db02
Change-Id: I468b528359f3f4cafe735f2bc9df08b755e66190
Remi NGUYEN VAN [Thu, 31 Jan 2019 14:36:24 +0000 (06:36 -0800)]
Merge "Add NetworkStackPermissionStub definitions" am:
0fe59007ce
am:
d1a7c18ec6
Change-Id: I201c5a28b7f07178a6980e582d05b36121037707
Howard Chen [Thu, 31 Jan 2019 14:35:49 +0000 (14:35 +0000)]
Merge "Add the DynamicAndroid Service"
Remi NGUYEN VAN [Thu, 31 Jan 2019 14:29:22 +0000 (06:29 -0800)]
Merge "Add NetworkStackPermissionStub definitions"
am:
0fe59007ce
Change-Id: I0cd613b09160f7a8f223bd2ec5ab29a85c219f66
Remi NGUYEN VAN [Thu, 31 Jan 2019 14:13:22 +0000 (14:13 +0000)]
Merge "Add NetworkStackPermissionStub definitions"
Remi NGUYEN VAN [Thu, 31 Jan 2019 13:06:04 +0000 (05:06 -0800)]
Merge "Prepare CaptivePortalLogin for system_current" am:
74b1c8626e
am:
9b29d62990
Change-Id: Id953d39b834fbe72137fcd7ee3b4aacc92266dbd
Remi NGUYEN VAN [Thu, 31 Jan 2019 12:56:51 +0000 (04:56 -0800)]
Merge "Prepare CaptivePortalLogin for system_current"
am:
74b1c8626e
Change-Id: I94b2c465290c36a601de89f6c9e8ebd138b2efe7
Remi NGUYEN VAN [Thu, 31 Jan 2019 12:46:00 +0000 (12:46 +0000)]
Merge "Prepare CaptivePortalLogin for system_current"
Remi NGUYEN VAN [Thu, 31 Jan 2019 12:20:50 +0000 (04:20 -0800)]
Merge "Fix bluetooth tethering on multi-user" am:
4bb4c1a792
am:
1a0ac241e8
Change-Id: I73c2a061f2aeae466f650d85f16cb4587b264737
Remi NGUYEN VAN [Wed, 30 Jan 2019 12:45:56 +0000 (21:45 +0900)]
Add NetworkStackPermissionStub definitions
The NetworkStackPermissionStub package is used to enforce that
permissions used by the NetworkStack are only used in packages
sharing signature with NetworkStackPermissionStub.
Permissions defined in this package are intended to be used only by the
NetworkStack: both NetworkStack and the stub APK will be signed with
a dedicated certificate to ensure that, with permissions being signature
permissions.
This APK *must* be installed, even if the NetworkStack app is not
installed, because otherwise, any application will be able to define
this permission and the system will give that application full access
to the network stack.
Test: flashed, booted
Bug:
112869080
Change-Id: Ia13a9e6a703cb7b4403697a7f7bfff0f6f3b813e
Remi NGUYEN VAN [Thu, 31 Jan 2019 12:09:29 +0000 (04:09 -0800)]
Merge "Fix bluetooth tethering on multi-user"
am:
4bb4c1a792
Change-Id: I24be143b38bdda59b4cc3037e495f0cb268a2b9f
Remi NGUYEN VAN [Thu, 31 Jan 2019 11:53:53 +0000 (11:53 +0000)]
Merge "Fix bluetooth tethering on multi-user"
Eran Messeri [Thu, 31 Jan 2019 11:48:40 +0000 (11:48 +0000)]
Add owners for KeyChain code
Add the Android Enterprise Security team as OWNERS for KeyChain and
KeyChain-related code.
The KeyChain code currently lives under keystore/, which means every
change requires Keystore owners approval, but it does not make sense for
KeyChain as KeyChain is a Keystore client and is developed
independently.
Test: Gerritt upload.
Bug:
33166666
Change-Id: Idfedda9553add303439179ce10a1e75e437bbe83
Remi NGUYEN VAN [Wed, 30 Jan 2019 15:16:27 +0000 (00:16 +0900)]
Compile CaptivePortalLogin as system_current
Test: make CaptivePortalLogin
Test: flashed, boots, login works
Bug:
112869080
Change-Id: I955c1b111ce76262fe20f5891b1853de0889f4b8
Remi NGUYEN VAN [Wed, 30 Jan 2019 14:39:24 +0000 (23:39 +0900)]
Prepare CaptivePortalLogin for system_current
Includes small changes to stop using non-SystemApi endpoints.
Test: make CaptivePortalLogin
Test: flashed, login works, SSL certificate invalid flow works
Bug:
112869080
Merged-In: Ic6ce98942959705ea7ef14a7a62d33e3abf7eb72
Change-Id: Ie7ea3bab6aa8629ce4c111adee0c0699d95d4b0e
Remi NGUYEN VAN [Thu, 31 Jan 2019 08:19:37 +0000 (00:19 -0800)]
Merge changes from topic "bindprocess-resolv" am:
643e60b0fe
am:
291e3726cd
Change-Id: I80f85170981c2f5b1ef949b5db88baf5fc101cd0
Remi NGUYEN VAN [Thu, 31 Jan 2019 08:11:25 +0000 (00:11 -0800)]
Merge changes from topic "bindprocess-resolv"
am:
643e60b0fe
Change-Id: I3aacc6c2ae5242e28eec6e9e8e2a9a4b3e4f715d
Remi NGUYEN VAN [Thu, 31 Jan 2019 07:52:04 +0000 (07:52 +0000)]
Merge changes from topic "bindprocess-resolv"
* changes:
Allow use of bindProcessToNetwork only to change private DNS bypass.
Allow bypassing private DNS via bindProcessToNetwork.
Mark Chien [Thu, 31 Jan 2019 07:49:43 +0000 (23:49 -0800)]
Merge "Add get last entitlement value callback API" am:
4163ff7928
am:
524fbd619e
Change-Id: I42892bdacaa41f9cea7e653f0bb9b5497192e5f6
Mark Chien [Thu, 31 Jan 2019 07:35:15 +0000 (23:35 -0800)]
Merge "Add get last entitlement value callback API"
am:
4163ff7928
Change-Id: I1961297c3fa31f5575ae3a11a3fc90d695cb7de5
Mark Chien [Thu, 31 Jan 2019 07:23:31 +0000 (07:23 +0000)]
Merge "Add get last entitlement value callback API"
Howard Chen [Mon, 7 Jan 2019 06:10:44 +0000 (14:10 +0800)]
Add the DynamicAndroid Service
Define the DynamicAndroid with AIDL.
Add a java implementation.
Start a service instance in the system server.
Add a permission test.
Bug:
122015653
Test: Build & Test on a pixel phone with following command \
./frameworks/base/services/tests/runtests.py -e class com.android.server.DynamicAndroidTest
Merged-In: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
Change-Id: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
Remi NGUYEN VAN [Wed, 30 Jan 2019 23:46:36 +0000 (08:46 +0900)]
Fix bluetooth tethering on multi-user
Bluetooth runs as UID
1001002 when on a secondary user. With this change
the NetworkStack verifies that the calling UID matches the Bluetooth app
regardless of the user.
Test: flashed, BT reverse tethering still working as primary user
(no option to turn on as secondary user on phones)
Bug:
123655057
Change-Id: I23f9c5fa40f3bb676ac65dd8c15106c9d78309a4
Remi NGUYEN VAN [Thu, 31 Jan 2019 06:29:31 +0000 (22:29 -0800)]
Merge "Add UserHandle.getAppId to SystemApi" am:
b334bbefd4
am:
dac257d27c
Change-Id: If35e251dbbbca2839529bbb999c6813fb601d1c0
Remi NGUYEN VAN [Thu, 31 Jan 2019 06:17:58 +0000 (22:17 -0800)]
Merge "Add UserHandle.getAppId to SystemApi"
am:
b334bbefd4
Change-Id: I6be04cb335e642921d67a68970078c2cae4af4e7
Remi NGUYEN VAN [Thu, 31 Jan 2019 06:04:11 +0000 (06:04 +0000)]
Merge "Add UserHandle.getAppId to SystemApi"
Nazanin Bakhshi [Thu, 31 Jan 2019 05:56:34 +0000 (21:56 -0800)]
Merge "Add a method to determine if a reboot is required to alter the modem config" am:
3483983223
am:
215383a8c3
Change-Id: I07189ff44859e1e6e07f1bdaed5e9d4957897475
junyulai [Thu, 31 Jan 2019 05:46:18 +0000 (21:46 -0800)]
Merge "[KA06] export keepalive offload permission as system api." am:
6943546771
am:
c9ada8727f
Change-Id: Ib1772c573a4cdb8413276f67c98091029254782f
Nazanin Bakhshi [Thu, 31 Jan 2019 05:40:48 +0000 (21:40 -0800)]
Merge "Add a method to determine if a reboot is required to alter the modem config"
am:
3483983223
Change-Id: Ifd643a44abfbb8cd9eab47279d14ad46c26a5dbc
junyulai [Thu, 31 Jan 2019 05:35:02 +0000 (21:35 -0800)]
Merge "[KA06] export keepalive offload permission as system api."
am:
6943546771
Change-Id: I7e73e50ff8bdbeff8b2f01e1d3bb4bbf95fba70f
Nazanin Bakhshi [Thu, 31 Jan 2019 05:23:43 +0000 (05:23 +0000)]
Merge "Add a method to determine if a reboot is required to alter the modem config"
Treehugger Robot [Thu, 31 Jan 2019 05:18:17 +0000 (05:18 +0000)]
Merge "[KA06] export keepalive offload permission as system api."
Holly Jiuyu Sun [Thu, 17 Jan 2019 22:41:14 +0000 (14:41 -0800)]
Handle permission check for multi-active SIMs devices.
For download and switch, if the caller can manage (has carrier privilege)
on any active sub on any other slots && the caller can manage the active
sub on the target slot or there is no active sub on the target slot, we
allow the caller to continue download. Otherwise, we require user consent.
For getting EID, we now check whether the caller has privilege on the
target card with the given cardId.
Other logic including the logic for single-active slot still keep the
same.
Also, open disable sub (switch to empty sub) to privileged carrier apps
instead of just system.
Bug:
36260308
Bug:
120621262
Test: unit test, test on phone
Change-Id: Icfc0c9e9f4303876bceb1adbe217b39b538b347e
Merged-In: Icfc0c9e9f4303876bceb1adbe217b39b538b347e
markchien [Wed, 16 Jan 2019 09:44:13 +0000 (17:44 +0800)]
Add get last entitlement value callback API
The callback would be used to notify entitlement value. If the
cache value indicates entitlement succeeded, it just fire
callback with cache value instead of run entitlement check.
Bug:
120887283
Test: atest FrameworksNetTests
Change-Id: I8afe928423bd75c54c61533a50a5c0814922ceb1
Nazanin Bakhshi [Wed, 30 Jan 2019 18:49:29 +0000 (10:49 -0800)]
Add a method to determine if a reboot is required to alter the modem config
Bug:
123101701
Test: sanity
Change-Id: I841b947efda0016c003f54ecf7853624582abab9
Merged-In: I841b947efda0016c003f54ecf7853624582abab9
(cherry picked from commit
7eca4afab4565ca1bd0f9827e93370885ba5ccea)
Nazanin Bakhshi [Thu, 31 Jan 2019 04:09:58 +0000 (20:09 -0800)]
Merge "Add telephony API to switch multi sim config" am:
602df1aa8c
am:
9fef7be245
Change-Id: Iad4a48b5117b11f63f3d086b42f879034fd415e3
Lorenzo Colitti [Thu, 31 Jan 2019 04:08:24 +0000 (13:08 +0900)]
Allow use of bindProcessToNetwork only to change private DNS bypass.
Currently it is not possible to change private DNS bypass by
doing:
setProcessDefaultNetwork(network.getPrivateDnsBypassingCopy());
setProcessDefaultNetwork(network);
because the code will ignore the change. Fix this by ensuring
that we always call bindProcessToNetwork (which does not have
side effects) and then only performing the expensive operations
(flushing DNS cache, upating socket pools) if the netId changed.
Bug:
112869080
Test: None
Change-Id: I5e8999cb11d8b8c1e9eb583fa8b3932f212accff
Remi NGUYEN VAN [Thu, 31 Jan 2019 03:36:54 +0000 (12:36 +0900)]
Add UserHandle.getAppId to SystemApi
This is consistent with other methods in this class, and unbundled
system apps such as the network stack need this API to verify their
callers regardless of the userid. The method is already marked as
TestApi.
Test: m
Bug:
123655057
Change-Id: I0ecef4abcd850dc641cd70681a56cb038778c04c
Nazanin Bakhshi [Thu, 31 Jan 2019 03:52:01 +0000 (19:52 -0800)]
Merge "Add telephony API to switch multi sim config"
am:
602df1aa8c
Change-Id: I313e7b92c485cf6f5b955b01391a52bcd9ee51f9
Tyler Gunn [Thu, 31 Jan 2019 03:45:30 +0000 (19:45 -0800)]
Merge "Call Screening / Caller ID API Changes" am:
8b194fe9d8
am:
d030f9d160
Change-Id: I2bed419aaf6e357c82e48506f70085ac98e729f7
Nazanin Bakhshi [Thu, 31 Jan 2019 03:44:15 +0000 (03:44 +0000)]
Merge "Add telephony API to switch multi sim config"
Varun Anand [Thu, 31 Jan 2019 03:39:50 +0000 (19:39 -0800)]
Merge "Add an API that allows VPNs to declare themselves as metered." am:
62a9b66a38
am:
9563c15d09
Change-Id: Iab1d2a3bf27ec9c033253ccd48ce8026e3b18799
Kweku Adams [Thu, 31 Jan 2019 03:33:59 +0000 (19:33 -0800)]
Merge "Informing app idle listeners on enabled state changes." am:
8c43f731cf
am:
1dbfcbc6f1
Change-Id: I06a21081e46a6773c1716329f7754f6ad00ae6d2
Tyler Gunn [Thu, 31 Jan 2019 03:27:41 +0000 (19:27 -0800)]
Merge "Call Screening / Caller ID API Changes"
am:
8b194fe9d8
Change-Id: I1ccdb9d1ed7c1e018dec20bbbef9334153adda21
Varun Anand [Thu, 31 Jan 2019 03:09:30 +0000 (19:09 -0800)]
Merge "Add an API that allows VPNs to declare themselves as metered."
am:
62a9b66a38
Change-Id: Iadf012754e2e39f4b99efc97d5666dd0bc1ff2d6
Tyler Gunn [Thu, 31 Jan 2019 03:05:52 +0000 (03:05 +0000)]
Merge "Call Screening / Caller ID API Changes"
Kweku Adams [Thu, 31 Jan 2019 03:04:44 +0000 (19:04 -0800)]
Merge "Informing app idle listeners on enabled state changes."
am:
8c43f731cf
Change-Id: I5adb182745f7598762ebd01ce10a3cd9d91aed01
Varun Anand [Thu, 31 Jan 2019 02:43:25 +0000 (02:43 +0000)]
Merge "Add an API that allows VPNs to declare themselves as metered."
Treehugger Robot [Thu, 31 Jan 2019 02:35:42 +0000 (02:35 +0000)]
Merge "Informing app idle listeners on enabled state changes."
Pavel Grafov [Thu, 31 Jan 2019 02:08:46 +0000 (18:08 -0800)]
Merge "Add sandness@ and rubinxu@ to OWNERS for UserRestrictionsUtils" am:
04bade33ce
am:
a49e88e74f
Change-Id: I67960b43a3eedabef418f4557edf7d4e2242e9bb
Pavel Grafov [Thu, 31 Jan 2019 01:59:51 +0000 (17:59 -0800)]
Merge "Add sandness@ and rubinxu@ to OWNERS for UserRestrictionsUtils"
am:
04bade33ce
Change-Id: I3d51d93e5c992fc27df9c637af68bb22f1f37dd1
Treehugger Robot [Thu, 31 Jan 2019 01:37:43 +0000 (01:37 +0000)]
Merge "Add sandness@ and rubinxu@ to OWNERS for UserRestrictionsUtils"
Christian Wailes [Thu, 31 Jan 2019 01:29:36 +0000 (17:29 -0800)]
Merge "Added OWNERS entries for some Zygote related files." am:
3ad8923842
am:
2f0392e6f7
Change-Id: If5c42163657b9704bcd4e257a0869e4ee8345793
Jack Yu [Thu, 31 Jan 2019 01:19:24 +0000 (17:19 -0800)]
Merge "Fixed crash in data service" am:
7fab753180
am:
ab5a5e8a58
Change-Id: I38fcae7f92de719ec49e3ecc4d630c0ec02b3e33
Christian Wailes [Thu, 31 Jan 2019 01:18:05 +0000 (17:18 -0800)]
Merge "Added OWNERS entries for some Zygote related files."
am:
3ad8923842
Change-Id: I2d7923044351f0473ee353d516a4d89657d0f05b
Jack Yu [Thu, 31 Jan 2019 01:08:00 +0000 (17:08 -0800)]
Merge "Fixed crash in data service"
am:
7fab753180
Change-Id: Iee394217f127e288f598ec802eb2b0b914823ff8
Christian Wailes [Thu, 31 Jan 2019 01:04:28 +0000 (01:04 +0000)]
Merge "Added OWNERS entries for some Zygote related files."
Jack Yu [Thu, 31 Jan 2019 00:46:04 +0000 (00:46 +0000)]
Merge "Fixed crash in data service"
Jack Yu [Wed, 30 Jan 2019 00:26:49 +0000 (16:26 -0800)]
Fixed crash in data service
Test: telephony sanity tests
Bug:
123598340
Change-Id: Ie15f8869849a2aed4a32f4f6731abd5ba1eb05cd
Nazanin Bakhshi [Wed, 30 Jan 2019 22:57:28 +0000 (14:57 -0800)]
Add telephony API to switch multi sim config
Bug:
122115649
Test: sanity
Change-Id: Idace8ed7f3fe78a6ce831225bda499a58a34c80f
Merged-In: Idace8ed7f3fe78a6ce831225bda499a58a34c80f
(cherry picked from commit
1e031bde1a85048bc43e72b38869d296db9ae228)
Remi NGUYEN VAN [Wed, 30 Jan 2019 22:42:34 +0000 (14:42 -0800)]
Merge "Add SystemApi for captive portal metrics" am:
55849979a5
am:
56bed1321e
Change-Id: I15adc597039539d53e5c08dc5f8cac74bcb0eda2
Pavel Grafov [Wed, 30 Jan 2019 22:36:37 +0000 (14:36 -0800)]
Merge "Nuke old setAlwaysOnVpnPackageForUser method." am:
35a8f1a38a
am:
79867a16fb
Change-Id: I7f0de294357ae6c691d38be52dd278eb37d42116
Remi NGUYEN VAN [Wed, 30 Jan 2019 22:35:30 +0000 (14:35 -0800)]
Merge "Add SystemApi for captive portal metrics"
am:
55849979a5
Change-Id: I1d1406a10c33034cf379ea7735cb106d3c536c8e
Pavel Grafov [Wed, 30 Jan 2019 22:27:01 +0000 (14:27 -0800)]
Merge "Nuke old setAlwaysOnVpnPackageForUser method."
am:
35a8f1a38a
Change-Id: If3cb37b8fa19dd49b8595622b293886653d7a319
Remi NGUYEN VAN [Wed, 30 Jan 2019 22:24:12 +0000 (22:24 +0000)]
Merge "Add SystemApi for captive portal metrics"