Commit Graph

7569 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
76dc026c0f Merge "Remove PARENT_SUB_ID since it's no longer needed." 2018-11-29 18:50:03 +00:00
Chen Xu
01ce898135 Merge "add more comments in advanced calling URL" am: 194cd0d45a am: ddbdb77797
am: 39cf394fe4

Change-Id: I5f94381d83806e1df240de76d10ee460cce202f6
2018-11-28 12:55:23 -08:00
Chen Xu
39cf394fe4 Merge "add more comments in advanced calling URL" am: 194cd0d45a
am: ddbdb77797

Change-Id: Ia308e8b4de815749b5466100cb0dadda80bb921f
2018-11-28 12:18:59 -08:00
Pengquan Meng
ece8fcc0c7 Merge "Implement physicalChannelConfig framework/base" am: c291d32338
am: 40830b3d4a

Change-Id: I57ea9285bc9fb2e71095906b6e4ac3666f922563
2018-11-28 12:11:07 -08:00
Chen Xu
194cd0d45a Merge "add more comments in advanced calling URL" 2018-11-28 19:40:36 +00:00
chen xu
83a8fb52e0 add more comments in advanced calling URL
Bug: 120071848
Test: Build
Change-Id: Idbcd32f965edf98204ad7b7cbacdca4291bc5687
2018-11-28 19:38:59 +00:00
Pengquan Meng
c291d32338 Merge "Implement physicalChannelConfig framework/base" 2018-11-28 19:34:46 +00:00
Malcolm Chen
b9030a2a1c Remove PARENT_SUB_ID since it's no longer needed.
Bug: 120141126
Test: build and flash
Change-Id: Ie482ba707ecb8b02d6c8f9e3b8bcdc30c835878e
2018-11-28 11:15:57 -08:00
TreeHugger Robot
ea2cc72610 Merge "Remove static for getSubscriptionIds" 2018-11-28 07:30:25 +00:00
Pengquan Meng
d24193dcf5 Implement physicalChannelConfig framework/base
Bug: 111453000
Test: atest FrameworksTelephonyTests
Merged-In: I390958aeed7182242d5623c10b6fd552ba35005a
Change-Id: I390958aeed7182242d5623c10b6fd552ba35005a
2018-11-27 19:44:17 -08:00
Josh Hou
03d0a6a289 Merge "Support set/get carrier id from ApnSetting" am: 72973de352
am: 3b195c1ef6

Change-Id: Ie11c7e05f72f6838565451aa9814fa6ffcd51e1b
2018-11-27 19:09:26 -08:00
Josh Hou
72973de352 Merge "Support set/get carrier id from ApnSetting" 2018-11-28 02:42:23 +00:00
Pengquan Meng
abc8131285 Merge "Implement physicalChannelConfig framework/base" 2018-11-28 00:14:02 +00:00
Xiangyu/Malcolm Chen
f37b105c88 Merge "Migration of IRadio 1.3 types to 1.4." am: c96a716a54
am: 46fd611f85

Change-Id: I644d716331a36c1e311c395299dd75a71ccdb6bf
2018-11-27 13:37:26 -08:00
Xiangyu/Malcolm Chen
c96a716a54 Merge "Migration of IRadio 1.3 types to 1.4." 2018-11-27 21:00:42 +00:00
Malcolm Chen
0e3b24f27c Migration of IRadio 1.3 types to 1.4.
To better test CBRS, we want IRadio 1.3 to be Android P plus CBRS
HAL interfaces, while 1.4 will be 1.3 plus all other Android Q
interfaces. So we are moving everything currently defined in
android.hardware.radio.V1_3 to android.hardware.radio.V1_4.

Bug: 117805040
Test: build and telephony unittest
Change-Id: I2c9bcf77ebfbda144bf184b43e196c1dd1ca466b
Merged-In: I2c9bcf77ebfbda144bf184b43e196c1dd1ca466b
2018-11-27 19:15:02 +00:00
Xiangyu/Malcolm Chen
37b17fffe7 Merge "Fix telephony build" am: 542b99d8ac
am: 4900fcbd93

Change-Id: I9f706c303b0c27e3cdfe4788de248339e6227e83
2018-11-27 10:59:34 -08:00
Xiangyu/Malcolm Chen
60cfbed4ff Merge "Migration of IRadio 1.3 types to 1.4." 2018-11-27 18:50:42 +00:00
Xiangyu/Malcolm Chen
542b99d8ac Merge "Fix telephony build" 2018-11-27 18:38:22 +00:00
Xiangyu/Malcolm Chen
a5c0f26e51 Merge "Clean up SubMgr#getOpportunisticSubscriptions." am: 103d515c80
am: b4750ecffa

Change-Id: Iab70b91e4a39c2c77d834977cdc4734875ae947b
2018-11-27 10:22:41 -08:00
Xiangyu/Malcolm Chen
103d515c80 Merge "Clean up SubMgr#getOpportunisticSubscriptions." 2018-11-27 18:01:58 +00:00
John Reck
c877f58a1a Fix telephony build
Correct permission tag format.

Test: make

Change-Id: I9db9ab609a924f786bb7031e6def86cbe2ac4c81
Merged-In: I9db9ab609a924f786bb7031e6def86cbe2ac4c81
2018-11-27 09:10:29 -08:00
Josh Hou
73ada28be9 Support set/get carrier id from ApnSetting
To align with using carrier id instead of mccmnc and mvno for APN
settings, add new public api setCarrierId and getCarrierId

Bug: 115709816
Test: run telephony unit test
Change-Id: Ia716a02dfa88996cb0539e34b411aab371ef8aa7
Merged-in: Ia716a02dfa88996cb0539e34b411aab371ef8aa7
2018-11-27 08:48:08 +00:00
Xiangyu/Malcolm Chen
7fb4f33d40 Merge "Change expected default value of setPreferredData" am: 2e64868e1d
am: e77fbed6b5

Change-Id: I8d0ca488177ee91de92d87d490f81fce3cb6567e
2018-11-26 21:59:39 -08:00
Xiangyu/Malcolm Chen
2e64868e1d Merge "Change expected default value of setPreferredData" 2018-11-27 05:32:00 +00:00
Hall Liu
497fe21a71 Merge "Make MBMS group call API changes" am: 50cc796c28 am: 000e80e747
am: b8ac0d31a9

Change-Id: I3635e7ced8397d225096016d00046755117a1337
2018-11-26 18:49:16 -08:00
Hall Liu
b8ac0d31a9 Merge "Make MBMS group call API changes" am: 50cc796c28
am: 000e80e747

Change-Id: Ia9f198cb0b66cc7690ba9ff11f677b27714dd31d
2018-11-26 18:12:59 -08:00
Xiangyu/Malcolm Chen
6395b33290 Merge "Clear calling identity in callback." am: 0b4026b345
am: b7bebbc3fc

Change-Id: I92a2392d8d017759da671e25d98ebcf475c4a877
2018-11-26 17:35:11 -08:00
Xiangyu/Malcolm Chen
f1a39cde78 Merge "Remove parentSubId and define API to set groupSubId" am: d413b5c713
am: e1015e70c4

Change-Id: I4ed0c97ac3961da37397ba1bd0ea24535a6764b8
2018-11-26 17:27:21 -08:00
Hall Liu
50cc796c28 Merge "Make MBMS group call API changes" 2018-11-27 01:06:55 +00:00
Xiangyu/Malcolm Chen
0b4026b345 Merge "Clear calling identity in callback." 2018-11-27 00:24:14 +00:00
Xiangyu/Malcolm Chen
d413b5c713 Merge "Remove parentSubId and define API to set groupSubId" 2018-11-27 00:24:00 +00:00
Jordan Liu
5333436303 Merge "Expose ApnService as a SystemApi and use subId arg" am: 0e706db965
am: 6a0161a184

Change-Id: Ia1abe2d229a034ba0a77ac3dd7034ff3c13dde55
2018-11-26 15:40:03 -08:00
Jordan Liu
0e706db965 Merge "Expose ApnService as a SystemApi and use subId arg" 2018-11-26 22:47:52 +00:00
Hall Liu
c81cba4e2b Make MBMS group call API changes
Change the API to respond to API council comments
See bug for details

Bug: 117145859
Test: CTS
Change-Id: I4342e6e95da57fbcd550c571357ff7bc1923b70a
2018-11-26 14:37:56 -08:00
Malcolm Chen
003c8e5cca Change expected default value of setPreferredData
Change expected value from INVALID to DEFAULT_SUSCRIPTION_ID
when caller wants to change back to user setting.
Correct spelling.

Bug: 118491136
Test: unittest
Change-Id: I0c953ba654d5465f973db6e9c7f7bacd5db23831
Merged-In: I0c953ba654d5465f973db6e9c7f7bacd5db23831
2018-11-26 14:24:23 -08:00
Malcolm Chen
aea9b02a22 Remove parentSubId and define API to set groupSubId
Bug: 118349116
Test: unittest
Change-Id: I539a67df8f30c2f58d87a3417f78fef8b43ff56d
Merged-In: I539a67df8f30c2f58d87a3417f78fef8b43ff56d
2018-11-26 14:13:10 -08:00
Youming Ye
8b84998fff Merge "Add CarrierConfig to hide Preset APN setting details" am: 4d73d87d83 am: e7e0dcdabe
am: 038ee2644b

Change-Id: I7c848ce780f65e5f354db0221456b2d01199ab6b
2018-11-26 14:08:29 -08:00
Malcolm Chen
b2129eb6b1 Clear calling identity in callback.
In SubscriptionManager, when onSubscriptionsChanged is called
when opportunistic subscriptions change, clear calling identity.
Otherwise mExecutor is executed with phone process identity
which can be a security issue.

Test: build
Bug: 117794788
Change-Id: I766cdc89f0421265cab00dc40d53f355deb7b92b
Merged-In: I766cdc89f0421265cab00dc40d53f355deb7b92b
2018-11-26 14:06:49 -08:00
Youming Ye
038ee2644b Merge "Add CarrierConfig to hide Preset APN setting details" am: 4d73d87d83
am: e7e0dcdabe

Change-Id: I8952ee0f6287f7a64075a2d633b8adf29d857f01
2018-11-26 13:51:16 -08:00
Youming Ye
4d73d87d83 Merge "Add CarrierConfig to hide Preset APN setting details" 2018-11-26 21:14:14 +00:00
Malcolm Chen
8310bcdcc9 Migration of IRadio 1.3 types to 1.4.
To better test CBRS, we want IRadio 1.3 to be Android P plus CBRS
HAL interfaces, while 1.4 will be 1.3 plus all other Android Q
interfaces. So we are moving everything currently defined in
android.hardware.radio.V1_3 to android.hardware.radio.V1_4.

Bug: 117805040
Test: build and telephony unittest
Change-Id: I2c9bcf77ebfbda144bf184b43e196c1dd1ca466b
2018-11-25 15:14:47 -08:00
Chen Xu
f54b45c68b Merge "integrate carrier id to carrier config" am: cc37384e58
am: 9a93149dab

Change-Id: If10abd107b6cf8f07819993fdcbee58328034ab3
2018-11-21 21:32:11 -08:00
Chen Xu
cc37384e58 Merge "integrate carrier id to carrier config" 2018-11-22 05:06:55 +00:00
chen xu
d95965ae1b integrate carrier id to carrier config
add carrierId and preciseCarrierId in CarrierIdentifier
which will be passed to carrier service to decide which carrier
info to look up

Bug: 110559381
Change-Id: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
Merged-in: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
2018-11-21 17:29:43 -08:00
Chen Xu
ecfc941500 Merge "integrate carrier id to carrier config" 2018-11-22 01:22:23 +00:00
taiki tsutsumi
2ee968289e Add CarrierConfig to hide Preset APN setting details
Add new key to hide Preset APN setting details. When the key is set to
true, Preset APN is still shown and selectable in APN list, however,
user cannot enter APN editor view. It means details of Preset APN will
be hidden from user.

Test: manual - check Preset APN setting details are hidden
Bug: 115453290
Change-Id: I8a5c6f92f876d349b304acf89b4ffab86ff3f24b
2018-11-21 15:41:49 -08:00
Pengquan Meng
9d242e00cf Implement physicalChannelConfig framework/base
Bug: 111453000
Test: atest FrameworksTelephonyTests
Change-Id: I390958aeed7182242d5623c10b6fd552ba35005a
2018-11-21 14:46:23 -08:00
Brad Ebinger
a5019f8d8a Merge "Expose ImsMmTelManager APIs as SystemApi" am: 8a3518cc90 am: 674804fcff
am: c61177a53e

Change-Id: I5c3a1d8ece83eb9dd7eae4151b77f0d70b6b7b6a
2018-11-21 11:46:25 -08:00
Brad Ebinger
c61177a53e Merge "Expose ImsMmTelManager APIs as SystemApi" am: 8a3518cc90
am: 674804fcff

Change-Id: Ib2d83d265a977834bf6ed2fc843be61d9d6993a4
2018-11-21 11:21:58 -08:00