OSDN Git Service
Chalard Jean [Fri, 12 Jan 2018 08:46:39 +0000 (08:46 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes" am:
2fef505e1e
am:
a3373bd461
Change-Id: Ie8d38267581ab3e1bdf4b5373487a2375f8649ed
Chalard Jean [Fri, 12 Jan 2018 08:32:34 +0000 (08:32 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes"
am:
2fef505e1e
Change-Id: I10be317ba9e6ac1fc6c30eda3db2c3b6b4adabe0
Hyunyoung Song [Fri, 12 Jan 2018 05:55:42 +0000 (05:55 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607 am:
69d240d584
am:
3aab9561b2
Change-Id: I554c6f320ec32b0151097701a5ff3a8d48161d7f
Hyunyoung Song [Fri, 12 Jan 2018 05:44:25 +0000 (05:44 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607
am:
69d240d584
Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f
Hyunyoung Song [Fri, 12 Jan 2018 05:31:38 +0000 (05:31 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
am:
48df033607
Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465
TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
Chalard Jean [Fri, 12 Jan 2018 05:11:29 +0000 (05:11 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes"
Andreas Gampe [Fri, 12 Jan 2018 02:42:43 +0000 (02:42 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate" am:
5edae415b0
am:
75dc3e9cf4
Change-Id: Ifbe406bda739b3689ca9ed95493a8eca7a9276ae
Andreas Gampe [Fri, 12 Jan 2018 02:32:15 +0000 (02:32 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate"
am:
5edae415b0
Change-Id: Idef313e1a0c1a69434783da2441a84aa6e12409e
Jerry Zhang [Fri, 12 Jan 2018 01:48:01 +0000 (01:48 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver" am:
68ad3d119c -s ours
am:
da57c7d0e9
Change-Id: Ifaab0c2d5265ccfd148edbc77668c67724de915e
Jerry Zhang [Fri, 12 Jan 2018 01:32:14 +0000 (01:32 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver"
am:
68ad3d119c -s ours
Change-Id: Icbc53b1d1c65b60dd128f4d3f3b4e59367f4a3a1
Amit Mahajan [Fri, 12 Jan 2018 00:01:33 +0000 (00:01 +0000)]
Merge "Add new config for number of physical SIM slots on the device." am:
61fa313810
am:
6d9869afad
Change-Id: Ifed6cc6b982f322a479882b6465d1b473faaee65
Treehugger Robot [Thu, 11 Jan 2018 23:52:46 +0000 (23:52 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate"
Jerry Zhang [Thu, 11 Jan 2018 23:50:34 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver"
Amit Mahajan [Thu, 11 Jan 2018 23:50:28 +0000 (23:50 +0000)]
Merge "Add new config for number of physical SIM slots on the device."
am:
61fa313810
Change-Id: I85e549568fd7e6cd2397d2162e53308b89f7c1b0
Holly Jiuyu Sun [Thu, 11 Jan 2018 23:11:05 +0000 (23:11 +0000)]
Merge "Add EuiccCardManager and EuiccCardController." am:
ec25ea1520
am:
edc14bd3c4
Change-Id: I5ac16981ac7ca4d492387a340f10a34b8ab1d804
Selim Gurun [Thu, 11 Jan 2018 23:02:45 +0000 (23:02 +0000)]
Merge "Make Bluetooth constants used by gmscore a system api" am:
ff9bc3a88c
am:
6dc20d40fd
Change-Id: Ic7d15fe855d7e3e6b3c9444e0641e2e141181154
Holly Jiuyu Sun [Thu, 11 Jan 2018 22:57:10 +0000 (22:57 +0000)]
Merge "Add EuiccCardManager and EuiccCardController."
am:
ec25ea1520
Change-Id: I2969dfc9d6b7b46d0747b18f8c3675d30fce2710
Selim Gurun [Thu, 11 Jan 2018 22:53:31 +0000 (22:53 +0000)]
Merge "Make Bluetooth constants used by gmscore a system api"
am:
ff9bc3a88c
Change-Id: If88978450234f119845a2e035fe31978e25a0189
Treehugger Robot [Thu, 11 Jan 2018 22:43:10 +0000 (22:43 +0000)]
Merge "Add new config for number of physical SIM slots on the device."
Greg Hackmann [Thu, 11 Jan 2018 21:04:54 +0000 (21:04 +0000)]
Merge "PaintMeasureTextTest: only pause/resume not_cached benchmarks" into oc-mr1-dev
am:
f523fe4fa7
Change-Id: Ic4f2a05791a9ae375bc0acb220c48e78f7d6cea1
Badhri Jagan Sridharan [Thu, 11 Jan 2018 20:57:26 +0000 (20:57 +0000)]
Merge "Overcome disconnect during oem override" am:
5e093d997a
am:
961cc1867b
Change-Id: I2e34b0795448cee1aca306202f61e491c80bd78e
TreeHugger Robot [Thu, 11 Jan 2018 20:50:20 +0000 (20:50 +0000)]
Merge "PaintMeasureTextTest: only pause/resume not_cached benchmarks" into oc-mr1-dev
Badhri Jagan Sridharan [Thu, 11 Jan 2018 20:49:49 +0000 (20:49 +0000)]
Merge "Overcome disconnect during oem override"
am:
5e093d997a
Change-Id: Ie6b379df14d67123f5644b8febeae4a7f1c22b0e
Holly Jiuyu Sun [Thu, 11 Jan 2018 20:44:33 +0000 (20:44 +0000)]
Merge "Add EuiccCardManager and EuiccCardController."
Treehugger Robot [Thu, 11 Jan 2018 20:22:05 +0000 (20:22 +0000)]
Merge "Make Bluetooth constants used by gmscore a system api"
Tyler Gunn [Thu, 11 Jan 2018 19:52:38 +0000 (19:52 +0000)]
Merge "Add support for notification of LTE to WIFI handover for video calls." into oc-mr1-dev
am:
d29f6f12f5
Change-Id: Id99d2c524cb4080ebecff571a4117c0b319b70e8
Tyler Gunn [Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)]
Merge "Add support for notification of LTE to WIFI handover for video calls." into oc-mr1-dev
Jerry Zhang [Thu, 11 Jan 2018 18:46:13 +0000 (10:46 -0800)]
DO NOT MERGE: Add ScreenObserver
ScreenObserver allows system components to
monitor the screen lock state.
Bug:
68054513
Test: manual
Change-Id: I50f4690f68443f676d17e93efb1b7cb0857abd9e
Holly Jiuyu Sun [Fri, 22 Dec 2017 02:44:59 +0000 (18:44 -0800)]
Add EuiccCardManager and EuiccCardController.
EuiccCardManager is in the same path with EuiccManager.
EuiccCardController is in the same path with EuiccController.
Use getAllProfiles() as an example interface.
The implementation of EuiccCard and its content will be added in a
follow up CL.
The new API is marked as @hide and TODO for @SystemApi.
Bug:
38206971
Test: test on phone
Change-Id: I153937c0f79bdd1a00b06b234a6e254a3f43072c
Merged-In: I153937c0f79bdd1a00b06b234a6e254a3f43072c
Badhri Jagan Sridharan [Thu, 11 Jan 2018 17:53:11 +0000 (17:53 +0000)]
Merge "Overcome disconnect during oem override"
Erik Kline [Thu, 11 Jan 2018 12:43:38 +0000 (12:43 +0000)]
Merge changes I47ccfa99,I5db1de3e am:
08498c32f4
am:
03f3294103
Change-Id: I311f6c299daf1c8d21731187d8e78e55c5767564
Erik Kline [Thu, 11 Jan 2018 12:31:31 +0000 (12:31 +0000)]
Merge changes I47ccfa99,I5db1de3e
am:
08498c32f4
Change-Id: I8077e06fc9eeccbb776a3b09a117c66eb9074140
Treehugger Robot [Thu, 11 Jan 2018 11:33:30 +0000 (11:33 +0000)]
Merge changes I47ccfa99,I5db1de3e
* changes:
Extract DNS setting logic into DnsManager class
Add minimal test for setting DNS properties
Erik Kline [Wed, 13 Dec 2017 10:40:49 +0000 (19:40 +0900)]
Extract DNS setting logic into DnsManager class
In future, managing DNS-over-TLS hostname lookup and netd programming
can be encapsulated here.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
64133961
Change-Id: I47ccfa99c30c780524c45c4af605e720ccba34a0
Erik Kline [Thu, 11 Jan 2018 07:11:10 +0000 (16:11 +0900)]
Add minimal test for setting DNS properties
Test: as follows
Change-Id: I5db1de3ee8e179edd56c93988b821242b81c2387
Sehee Park [Thu, 11 Jan 2018 06:55:39 +0000 (06:55 +0000)]
Merge "Add checking permission at the setDataSaverModeEnabled()" am:
639fe64ce0
am:
a83bbf3516
Change-Id: I6f712ec5774287af1740f2e74a4bc5cbca0cba6c
Erik Kline [Thu, 11 Jan 2018 06:48:31 +0000 (06:48 +0000)]
Merge "Move DhcpClient SM thread onto IpClient's SM thread" am:
4a352dd5e0
am:
a6c594847d
Change-Id: Id124d26e03d3d91a234e78b5fad1aca682cf9f6d
Sehee Park [Thu, 11 Jan 2018 06:46:25 +0000 (06:46 +0000)]
Merge "Add checking permission at the setDataSaverModeEnabled()"
am:
639fe64ce0
Change-Id: Ic62ff6f6b85b2df86074557ed662227b3a7fd9b1
Erik Kline [Thu, 11 Jan 2018 06:43:13 +0000 (06:43 +0000)]
Merge "Move DhcpClient SM thread onto IpClient's SM thread"
am:
4a352dd5e0
Change-Id: I19f1606e017b8c4e92c4575b9e39c1b5198c31aa
Treehugger Robot [Thu, 11 Jan 2018 05:52:59 +0000 (05:52 +0000)]
Merge "Add checking permission at the setDataSaverModeEnabled()"
Treehugger Robot [Thu, 11 Jan 2018 05:48:20 +0000 (05:48 +0000)]
Merge "Move DhcpClient SM thread onto IpClient's SM thread"
yuemingw [Thu, 11 Jan 2018 05:12:34 +0000 (05:12 +0000)]
Merge "Add public ApnSetting in android.telephony." am:
f9063b378b
am:
f68992a6a7
Change-Id: I959e4cc4f252b1a503dca11d83672257b93f97a4
yuemingw [Thu, 11 Jan 2018 05:06:13 +0000 (05:06 +0000)]
Merge "Add public ApnSetting in android.telephony."
am:
f9063b378b
Change-Id: I6608e1666b3e078f3b5786638e9050a2d2d3b762
Lorenzo Colitti [Thu, 11 Jan 2018 04:10:01 +0000 (04:10 +0000)]
Merge "Move more core networking tests to framework/base/tests/net." am:
d6c3813c08
am:
8f852c341f
Change-Id: Iab87e7ce5b62a1ff21c7aee5d0f25597713f6c65
Erik Kline [Thu, 11 Jan 2018 04:02:15 +0000 (04:02 +0000)]
Merge "Refactor to InterfaceParams utility class" am:
6a91687bcd
am:
fe83298cd5
Change-Id: Icb708a5ea7c3b41cb9d23885018b088c65ee427b
Treehugger Robot [Thu, 11 Jan 2018 04:01:32 +0000 (04:01 +0000)]
Merge "Add public ApnSetting in android.telephony."
Lorenzo Colitti [Thu, 11 Jan 2018 03:58:57 +0000 (03:58 +0000)]
Merge "Move more core networking tests to framework/base/tests/net."
am:
d6c3813c08
Change-Id: Ic1ad8ba5a4180ef6a798d4330c72920984d5040c
Erik Kline [Thu, 11 Jan 2018 03:55:41 +0000 (03:55 +0000)]
Merge "Refactor to InterfaceParams utility class"
am:
6a91687bcd
Change-Id: Ia8ea85890c86cf57b0bc701c2624762144af301e
Erik Kline [Fri, 9 Jun 2017 10:20:26 +0000 (19:20 +0900)]
Move DhcpClient SM thread onto IpClient's SM thread
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- basic wifi usage nominal
Bug:
62476366
Change-Id: I9a74e001bc86972e31b7e0898711628e65d9cf7a
Lorenzo Colitti [Thu, 11 Jan 2018 03:09:40 +0000 (03:09 +0000)]
Merge "Move more core networking tests to framework/base/tests/net."
Treehugger Robot [Thu, 11 Jan 2018 02:52:00 +0000 (02:52 +0000)]
Merge "Refactor to InterfaceParams utility class"
Erik Kline [Fri, 8 Dec 2017 08:47:50 +0000 (17:47 +0900)]
Refactor to InterfaceParams utility class
NetworkInterface throws Exceptions every time you look at it askance.
Try to make something we instantiate fully, once, and pass it around.
Partial MacAddress-ification as well, for good measure.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- basic IPv6 tethering works
Bug:
32163131
Bug:
62476366
Change-Id: I16c145fddb4e76387370338d792a438eed886d7f
Badhri Jagan Sridharan [Sat, 19 Aug 2017 00:26:05 +0000 (17:26 -0700)]
Overcome disconnect during oem override
Cherry-pick from
83a0d6fa577fab4d45aba38e3eb52b08b8123c17
While bootup, usb gets configured when the property triggers are
run. While in oemOverride, the current configuration is persisted
in sys.usb.<bootmode>.config. Do not reconfigure the stack if the
current configuration is same as the new configuration.
Bug:
64225494
Change-Id: Id35d110bf3fa8f58d05e14941716d4ad2b196f8d
Amit Mahajan [Sat, 6 Jan 2018 00:20:36 +0000 (16:20 -0800)]
Add new config for number of physical SIM slots on the device.
Test: Basic telephony sanity
Bug:
64131518
Merged-in: If393b144fd7280b11242caeb8bb4dc6a202f80ad
Change-Id: If393b144fd7280b11242caeb8bb4dc6a202f80ad
Qingxi Li [Wed, 10 Jan 2018 22:40:21 +0000 (22:40 +0000)]
Merge "Add API EuiccController#startOtaUpdatingIfNecessary" am:
999d998fb0
am:
a043a1c924
Change-Id: Ibf66b8ee23ad81d4119c5f94ad4caacf5abdf3ec
Qingxi Li [Wed, 10 Jan 2018 22:34:35 +0000 (22:34 +0000)]
Merge "Add API EuiccController#startOtaUpdatingIfNecessary"
am:
999d998fb0
Change-Id: If42a792cf2185452d2e654df7ef059cf88e23221
Treehugger Robot [Wed, 10 Jan 2018 21:29:02 +0000 (21:29 +0000)]
Merge "Add API EuiccController#startOtaUpdatingIfNecessary"
Qingxi Li [Thu, 14 Dec 2017 23:36:06 +0000 (15:36 -0800)]
Add API EuiccController#startOtaUpdatingIfNecessary
This function requests calling app has WRITE_EMBEDDED_SUBSCRIPTIONS
permission. It will check whether the OTA update needed to be done
first. If current eUICC OS isn't latest one and OTA needed to be
performed, it will update eUICC OS. When the OS update is started or
finished, a broadcast will be sent.
Bug:
37279356
Test: E2E
Merged-In: Iea86add4bdc01c79a8714af4b3a89735ba78ee74
Change-Id: Iea86add4bdc01c79a8714af4b3a89735ba78ee74
Victor Hsieh [Wed, 10 Jan 2018 19:57:17 +0000 (19:57 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork"" am:
54da93b981
am:
8fffe22ab1
Change-Id: Ic6b927ab28f75fb46f60dd77d5ae4ccf98c0b329
Jack Yu [Wed, 10 Jan 2018 19:50:34 +0000 (19:50 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity" am:
5e90553bcf
am:
18bd9922fb
Change-Id: Ic5802a6f39715f042d18bb25dd3481c4c79b508f
Victor Hsieh [Wed, 10 Jan 2018 19:38:49 +0000 (19:38 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork""
am:
54da93b981
Change-Id: Ibdeb9fb6af3525e6329d42c7eef654f14396bcd6
Jerry Zhang [Wed, 10 Jan 2018 19:36:53 +0000 (19:36 +0000)]
Merge "Revamp USB tethering startup flow." am:
90fddefd5e
am:
375c0a55d8
Change-Id: Ied9a69a24126aab0aae131816fb6bf605e704554
Jack Yu [Wed, 10 Jan 2018 19:34:50 +0000 (19:34 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity"
am:
5e90553bcf
Change-Id: I777781ddf78e08373c1e5d4989374847b03800cd
Myles Watson [Wed, 10 Jan 2018 19:32:21 +0000 (19:32 +0000)]
Merge "Don't wait for Bluetooth when shutting down" am:
d9b3322e88
am:
9ae00d9d9a
Change-Id: I005548cc409547cc6bdb7182c6d9ea52b4a4a46d
Jerry Zhang [Wed, 10 Jan 2018 19:26:48 +0000 (19:26 +0000)]
Merge "Revamp USB tethering startup flow."
am:
90fddefd5e
Change-Id: Ica932756d19c7ac874ae822c9785e856dcf81db3
Myles Watson [Wed, 10 Jan 2018 19:22:23 +0000 (19:22 +0000)]
Merge "Don't wait for Bluetooth when shutting down"
am:
d9b3322e88
Change-Id: I31142d6ac6b04d2cfb7fcfc721d251a956c81c11
Treehugger Robot [Wed, 10 Jan 2018 18:46:36 +0000 (18:46 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork""
Jack Yu [Wed, 10 Jan 2018 18:39:53 +0000 (18:39 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity"
Jerry Zhang [Wed, 10 Jan 2018 18:38:44 +0000 (18:38 +0000)]
Merge "Revamp USB tethering startup flow."
Jerry Zhang [Wed, 20 Dec 2017 22:26:39 +0000 (14:26 -0800)]
Revamp USB tethering startup flow.
Modify usb tethering flow to no longer require
mUsbTetherRequested. The new simplified flow is:
1. Usb rndis function is set through UsbManager
2. Usb is configured with rndis enabled
3. We tether the USB interface
4. Usb is disconnected
5. We untether the USB interface
This allows USB tethering to be enabled through
either UsbManager or ConnectivityManager and aligns
the flow to be similar to other usb function services
such as MTP.
Bug:
62876645
Test: Enable and disable tethering through connectivity and with `svc
usb setFunction rndis`
Change-Id: Ica4203a499db177999302e099e28948b06ef2298
Treehugger Robot [Wed, 10 Jan 2018 18:19:03 +0000 (18:19 +0000)]
Merge "Don't wait for Bluetooth when shutting down"
Myles Watson [Sat, 6 Jan 2018 00:12:54 +0000 (16:12 -0800)]
Don't wait for Bluetooth when shutting down
Bluetooth doesn't need to be shut down cleanly; shutting it down just
slows down the shutdown process.
Change-Id: I91fc9b26930a392f0c4462c76626a966051aea7b
Merged-In: Ic2ed89dd618806adc6646066ab0956dea4a94d8e
Bug:
70855323
Test: Boot, shut down, boot, shut down.
Jordan Liu [Wed, 10 Jan 2018 17:23:05 +0000 (17:23 +0000)]
Merge "Add precise disconnect cause in DisconnectCause" am:
8098078edf
am:
e77087994d
Change-Id: I1aae0435aa09faaeae396242fcd01cd6c7480527
Victor Hsieh [Wed, 10 Jan 2018 17:22:25 +0000 (17:22 +0000)]
Revert "Move zygote's seccomp setup to post-fork"
This reverts commit
6a4a3398325787f6cb1b93db17a7bf50d353e2a5.
Reason for revert: caused some SELinux error
Bug:
71768585
Change-Id: I0ef270ec6fed1d5d96b4257ec1a2dd6a55a816ed
Merged-In: Ic1b81e146b52b68445ba634de39657f199107da3
Jordan Liu [Wed, 10 Jan 2018 17:15:17 +0000 (17:15 +0000)]
Merge "Add precise disconnect cause in DisconnectCause"
am:
8098078edf
Change-Id: Idac4f27406b359bf51ae33f483d651e9e8316504
Jordan Liu [Wed, 10 Jan 2018 17:06:14 +0000 (17:06 +0000)]
Merge "Add precise disconnect cause in DisconnectCause"
Lorenzo Colitti [Fri, 14 Apr 2017 15:12:33 +0000 (00:12 +0900)]
Move more core networking tests to framework/base/tests/net.
Test: "runtest frameworks-net" passes except for already-failing IpConnectivityMetricsTest
Change-Id: I2a20d546089699ac67bc819f10a8fcd50c637ac4
Jack Yu [Thu, 28 Dec 2017 22:41:12 +0000 (14:41 -0800)]
Added Cell identity for TD-SCDMA and a base class CellIdentity
Added CellIdentityTdscdma for TDS-CDMA cell identity. Also added
a base class for existing CellIdentityXxx so that the network
service can return specific RAT cell identity through the
network service callback API which takes generic cell identity
as the parameter.
This is the preliminary change for IWLAN refactoring since cell
identity is part of the CS/PS network registration.
bug:
64132030
Test: Unit tests
Change-Id: I3ca405d687667b6c43e782339edec26a6f6edfc9
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:49:06 +0000 (05:49 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo." am:
b01bd54b11
am:
6a5dc32ac3
Change-Id: I3d6df6f2bce5b6e19ce0ef2c13adc39fa1b9a862
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:35:48 +0000 (05:35 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo."
am:
b01bd54b11
Change-Id: I98c726fc7d6fb91e16234773fe6423b7e111126e
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:21:35 +0000 (05:21 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo."
yinxu [Wed, 10 Jan 2018 03:28:45 +0000 (03:28 +0000)]
Merge "Check null before calling clone()" am:
e1bdd513d0
am:
1c60aa03fc
Change-Id: Ie06c696c8805e188d1af3121c66f3180a9845c16
yinxu [Wed, 10 Jan 2018 03:18:37 +0000 (03:18 +0000)]
Merge "Check null before calling clone()"
am:
e1bdd513d0
Change-Id: Ifabe6352c950f9d6ead4cbdd4345ef1fb20f065d
yuemingw [Fri, 24 Nov 2017 18:20:11 +0000 (18:20 +0000)]
Add public ApnSetting in android.telephony.
Bug:
68208293
Test: manual
Add public ApnSetting class in android.telephony. Move APN TYPE constants out from
PhoneConstants into public ApnTypeConstants.
Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit?pli=1#
Change-Id: I74d23644a872df0abc19730285ae196b6e3e39dd
Treehugger Robot [Wed, 10 Jan 2018 03:07:26 +0000 (03:07 +0000)]
Merge "Check null before calling clone()"
Jack Yu [Wed, 10 Jan 2018 02:39:54 +0000 (02:39 +0000)]
Merge "Exposed CDMA SID/NID get APIs" am:
0cb936a855
am:
46ffa48122
Change-Id: I4693b44d59a312def9f26ad54badd5533cd36dfd
Jack Yu [Wed, 10 Jan 2018 02:33:16 +0000 (02:33 +0000)]
Merge "Exposed CDMA SID/NID get APIs"
am:
0cb936a855
Change-Id: Iec76a777a126a10c012363247acb4b6a3516c008
Treehugger Robot [Wed, 10 Jan 2018 02:19:20 +0000 (02:19 +0000)]
Merge "Exposed CDMA SID/NID get APIs"
Elliott Hughes [Wed, 10 Jan 2018 01:46:14 +0000 (01:46 +0000)]
Merge "Remove obsolete workaround." am:
f448371208
am:
365604c300
Change-Id: Ia153c371b8833b926b3e643bf265e67a438dfd91
Elliott Hughes [Wed, 10 Jan 2018 01:35:34 +0000 (01:35 +0000)]
Merge "Remove obsolete workaround."
am:
f448371208
Change-Id: I2bd057c12b9915b9e45b206b9839d1a57b296f26
Treehugger Robot [Wed, 10 Jan 2018 01:24:41 +0000 (01:24 +0000)]
Merge "Remove obsolete workaround."
Cassie Han [Wed, 10 Jan 2018 01:20:42 +0000 (01:20 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am:
72acefa6d8
am:
b51df90f28
Change-Id: I7045d6b684351e3545d24a52d16cb53d85483f20
Cassie Han [Wed, 10 Jan 2018 01:08:55 +0000 (01:08 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
am:
72acefa6d8
Change-Id: I25ad45c52cdcb9b4bf3d21f4f3b71c68e8ace362
Cassie Han [Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
yinxu [Wed, 10 Jan 2018 00:27:10 +0000 (16:27 -0800)]
Check null before calling clone()
Bug:
67748005
Test: Basic telephony sanity
Change-Id: Ia46a82823b2d3c2bf3a6cb77a6fe191a7f7cb5d0
Jack He [Wed, 10 Jan 2018 00:26:33 +0000 (00:26 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am:
b1065d6995
am:
8dbfc24e5f
Change-Id: I52fce02e6a0169dff418f4dae89ae54de7fd952d
Jack He [Wed, 10 Jan 2018 00:18:15 +0000 (00:18 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"
am:
b1065d6995
Change-Id: Ia3112caa3971406cb0ef44cc25c19865a0b6ddf1
Treehugger Robot [Wed, 10 Jan 2018 00:07:11 +0000 (00:07 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"
Malcolm Chen [Wed, 10 Jan 2018 00:06:27 +0000 (00:06 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager." am:
ed7eead23b
am:
6b943d5deb
Change-Id: I132cc6d3de77f20717a40884683fb0c81fbb7083
OSDN Git Service
