Commit Graph

7213 Commits

Author SHA1 Message Date
Malcolm Chen
71f85f597f Add APIs to remove sub from a group and get subs in the same gorup. am: be9240bcf0
am: 7e1f24c626

Change-Id: I0802842535ffd512efbe99e968d44fab1725c8d1
2018-12-20 16:52:54 -08:00
Malcolm Chen
7e1f24c626 Add APIs to remove sub from a group and get subs in the same gorup.
am: be9240bcf0

Change-Id: If82ec04193b9288ff56ac1850899beadaf392d48
2018-12-20 16:29:58 -08:00
Chen Xu
9a8b822096 Merge "refactor dataFailCause" am: 9371864133
am: ab7ada8060

Change-Id: I33f628f04da1402fe402c5234a78d4cf9d436d00
2018-12-19 23:26:59 -08:00
chen xu
5e499effba refactor dataFailCause
1. add comments for each data fail cause.
2. refactor dataFailCause from enum to int

Bug: 119891533
Test: Build & unit test
Change-Id: Ic453f80a3d0ccd22c6c4c1f4b2c90e2bf40cfbe1
(cherry picked from commit 3016167192)
Merged-in: Ic453f80a3d0ccd22c6c4c1f4b2c90e2bf40cfbe1
2018-12-19 21:59:50 -08:00
Malcolm Chen
be9240bcf0 Add APIs to remove sub from a group and get subs in the same gorup.
Add APIs in SubscriptionController so that caller with permissions
can remove subscriptions from a group or get all subscriptions with
the same group.

Bug: 118349116
Test: unittest
Change-Id: Iba4d31b437b372b3f41a6ed23f03b96a685a324c
Merged-In: Iba4d31b437b372b3f41a6ed23f03b96a685a324c
2018-12-19 19:02:12 -08:00
Nathan Harold
8ef57c30f8 Merge "Annotate getMobileNetworkOperator() as Nullable" am: 795641f25e
am: bef297206b

Change-Id: I92f7ea6f56a62ff167a1a8710d42639a598a2bd2
2018-12-19 11:24:45 -08:00
Nathan Harold
795641f25e Merge "Annotate getMobileNetworkOperator() as Nullable" 2018-12-19 18:49:56 +00:00
Nathan Harold
a6d51ea03e Merge "Annotate CallbackExecutor in requestCellInfoUpdate" am: ff9932a7aa
am: 0e4586f47b

Change-Id: I0dfa32f5b988a55d01bda9295efab5ba27fbc0f6
2018-12-19 10:48:23 -08:00
Chen Xu
eb04d15cd8 Merge "add carrierid in subscriptionInfo" am: dcab1747cf
am: 0ee1e893ac

Change-Id: Ic0cbe9fd707d48d62b40ea6a03bcc55cd507ee71
2018-12-19 10:34:28 -08:00
Nathan Harold
ff9932a7aa Merge "Annotate CallbackExecutor in requestCellInfoUpdate" 2018-12-19 18:26:37 +00:00
chen xu
64e81db02f add carrierid in subscriptionInfo
add carrierid in subscritionInfo so that apps can get
subId, carrierid and other sim related info from a single call

Bug: 119676543
Test: gts SubscriptionInfoTest
Change-Id: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
(cherry picked from commit 0034bb393c)
Merged-in: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
2018-12-18 23:21:57 -08:00
Josh Hou
3a71f85085 Merge "Print carrier Id information in toString()" am: 843e387bb6
am: 55b4b268f5

Change-Id: I2a9fa3332c842bda8856006c7963814838ae8544
2018-12-18 17:52:06 -08:00
Josh Hou
843e387bb6 Merge "Print carrier Id information in toString()" 2018-12-19 01:22:25 +00:00
Nathan Harold
6655dddcd5 Annotate CallbackExecutor in requestCellInfoUpdate
Add a missing annotation for CallbackExecutor in
requestCellInfoUpdate().

Bug: 120489428
Test: compilation (no functional change)
Change-Id: I33bba9eb59f81aaefa0194b58936d4f809a8d51f
2018-12-18 15:09:28 -08:00
Nathan Harold
13d6b11987 Annotate getMobileNetworkOperator() as Nullable
Add Nullable annotations for the classes that support
getMobileNetworkOperator().

Bug: 118675404
Test: compilation (no functional change)
Change-Id: I914ec8242aff2f578dfe1f97f2e7cfe2d109c7dc
2018-12-18 13:41:25 -08:00
Chen Xu
31cf647396 Merge "expose Carrier Id related APIs" am: 18b925a7af
am: 0031ae8145

Change-Id: I6e9837cffdcac094557ea99cde0736abdfff0ff9
2018-12-17 13:39:23 -08:00
Chen Xu
18b925a7af Merge "expose Carrier Id related APIs" 2018-12-17 20:56:54 +00:00
Pengquan Meng
b527f8a44c Merge "Add FrequencyRange comparator to ServiceState" am: d0c404cb21
am: 5cb84d7f23

Change-Id: I5550790e9db3604bf35d4f01b6e7fef316e3809e
2018-12-17 11:28:32 -08:00
Pengquan Meng
d0c404cb21 Merge "Add FrequencyRange comparator to ServiceState" 2018-12-17 19:07:27 +00:00
Josh Hou
619ac4fbab Print carrier Id information in toString()
Bug: 115709816
Test: Build pass
Change-Id: Idd3336c472860ad21121029abecb91aa9b8325ec
Merged-In: Idd3336c472860ad21121029abecb91aa9b8325ec
2018-12-17 07:14:26 +00:00
Jack Yu
52fdd0d508 Merge "Renamed data/net service provider onDestroy to close" am: 47d385a5b3
am: 8c539c5eee

Change-Id: If9596c83f8a5e960f4675b80ddcc1eab8f67c178
2018-12-14 15:53:13 -08:00
Pengquan Meng
424acc7f57 Add FrequencyRange comparator to ServiceState
The FrequencyRange is not comparable beucase it's an enum. This change
add a comparator to ServiceState to make the enum comparable.

Bug: 111453000
Test: atest FrameworksTelephonyTests
Merged-In: I59a595bdaf5451d2c4d95b1b5bdfefcba123fea7
Change-Id: I59a595bdaf5451d2c4d95b1b5bdfefcba123fea7
2018-12-14 14:49:18 -08:00
Meng Wang
4f7956f58c Merge "support vzw roaming default on" into pi-dev
am: 369d65b2e9

Change-Id: I056adbebe1efecb1a7d6f4fc09fbd94f1e4b52da
2018-12-14 10:45:56 -08:00
Jack Yu
cd67c02f1c Renamed data/net service provider onDestroy to close
Renamed them to avoid confusion with Android services'
onDestroy().

Test: Telephony sanity tests
Bug: 73659459
Change-Id: I05f68ced65498d6bfeb9e3c9ed3fb6164643bbaa
2018-12-14 00:22:02 -08:00
Chen Xu
f04d5a27d4 Merge "move and rename DcFailCause to DataFailCause" am: d2a163ad38
am: 49ebf0dfed

Change-Id: I725e3c5670428566373590b2c30603b0380fd3e9
2018-12-13 19:07:26 -08:00
Chen Xu
d2a163ad38 Merge "move and rename DcFailCause to DataFailCause" 2018-12-14 02:44:20 +00:00
Youming Ye
c8dad0200a Merge "Propagation of additional Ims Call Fail Causes" am: 97ee6295e9
am: 9834928c12

Change-Id: Ie3d7b237e3d7cfe2c53498807ff18bdbbfae61e9
2018-12-13 16:24:50 -08:00
Youming Ye
97ee6295e9 Merge "Propagation of additional Ims Call Fail Causes" 2018-12-13 23:47:49 +00:00
Sahin Caliskan
02278c9c53 Merge "Move RCS APIs to android.telephony.ims" am: 4929a0d782
am: 7c7dc29e8d

Change-Id: I2301681cd38c2d364c9e3a5bf94adb400065418c
2018-12-13 15:29:00 -08:00
Youming Ye
bab83ccabb Merge "Fix property setting with failure" am: da9de2d7fa
am: 58be59a233

Change-Id: Ia3994b3595d6ccd945dc9ca45f7fc4c46c12908a
2018-12-13 13:53:07 -08:00
chen xu
1afc47b154 move and rename DcFailCause to DataFailCause
Bug: 119891533
Test: Build
Change-Id: I6f0e474a9ee3f8befc8b0a221713a2080b59844c
Merged-in: I6f0e474a9ee3f8befc8b0a221713a2080b59844c
2018-12-13 12:54:38 -08:00
Sahin Caliskan
4929a0d782 Merge "Move RCS APIs to android.telephony.ims" 2018-12-13 20:48:34 +00:00
Sahin Caliskan
7719db2b16 Move RCS APIs to android.telephony.ims
This is due to being compatible with other RCS related changes by by other engineers.
Test: Existing tests pass

Bug: 109759350
Change-Id: Id56df22e9c313c5e0700eda3b2c489d2f84ea0cd
Merged-In: Id56df22e9c313c5e0700eda3b2c489d2f84ea0cd
2018-12-13 16:50:28 +00:00
Youming Ye
da9de2d7fa Merge "Fix property setting with failure" 2018-12-13 06:55:25 +00:00
Jordan Liu
f59b035894 Merge "Add API to get card ID for default eUICC" am: 97c68169b8
am: b957efea96

Change-Id: Ic2f23ca2bd7721468207de9e3342d7808bf87fd3
2018-12-12 20:28:30 -08:00
Jesse Fuentes
b9c35c1c0c Propagation of additional Ims Call Fail Causes
-Added new ImsReasonInfo error codes
-Add the new error codes in system-current.txt

Test:Manual
Bug:115925183

Change-Id: Id10651d08de2b77f0562e3c8733be76032a9611e
2018-12-12 17:49:50 -08:00
chen xu
64c1d7649a expose Carrier Id related APIs
1. expose public API for preciseCarrierId and preciseCarrierIdName
2. expose public API for carrier id in CarrierIdentifier
3. New public broadcast for precise carrier identity changed
4. clean up

Bug: 110559381
Test: unit test & atest CtsTelephonyTestCases:TelephonyManagerTest
Change-Id: I18f8bc3252632bba699829c6c577d1041335fee9
Merged-in: I18f8bc3252632bba699829c6c577d1041335fee9
2018-12-12 14:34:09 -08:00
Jordan Liu
97c68169b8 Merge "Add API to get card ID for default eUICC" 2018-12-12 22:20:03 +00:00
Michele Berionne
eda9958c6d Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING" am: ac9e1f5580
am: e4176ca234

Change-Id: Idf096efcf9e5301e006cd144f3c31d7c5b5d670d
2018-12-12 11:36:25 -08:00
Michele Berionne
ac9e1f5580 Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING" 2018-12-12 18:58:28 +00:00
Adrian Roos
d4f9f9f666 Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5
am: 963172ac83

Change-Id: I2251db66ef73d5b69c84b4e83f2788d2bc953eda
2018-12-12 08:44:43 -08:00
Adrian Roos
6115769c16 API: Clean up redundant and ineffective usages of SystemApi and TestApi
Everything that is marked SystemApi or TestApi, but not @hide is still
part of the public SDK, it is therefore not sound to have that combination.

In the future, specifing such a combination will be considered an error
to prevent inadvertently exposing SystemApi and TestApi as public API.

Bug: 115333477
Change-Id: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Merged-In: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Test: METALAVA_PREPEND_ARGS="--error UnhiddenSystemApi" m checkapi
Exempt-From-Owner-Approval: API cleanup
2018-12-12 15:02:26 +01:00
Hall Liu
b34a301827 Merge "Add fields for PhoneAccount to CallerInfo" am: 833bc7dba7
am: 5c8e7355c0

Change-Id: I27b8b353ae912cb9e301645aadcdd4433a761553
2018-12-11 16:32:34 -08:00
Brad Ebinger
15a54c386f Merge "Changes to IMS SS API to better fit API standards/" am: 91bd02534a
am: 6825dce3fb

Change-Id: Ib4341edece2bc0b1730ccd4e6c8312bca701aefa
2018-12-11 16:26:31 -08:00
Hall Liu
833bc7dba7 Merge "Add fields for PhoneAccount to CallerInfo" 2018-12-11 22:58:45 +00:00
Brad Ebinger
91bd02534a Merge "Changes to IMS SS API to better fit API standards/" 2018-12-11 22:57:26 +00:00
Jordan Liu
2fe9e3748a Add API to get card ID for default eUICC
getCardIdForDefaultEuicc() returns the cardId of the default eUICC.

Bug: 80097562
Test: manual, UiccControllerTest
Change-Id: Iee001ce354184dff4862a92b6bda261797c19e56
2018-12-11 13:35:08 -08:00
Michele Berionne
a04da3ede8 Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING
Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING, so that
it can be used by applications.

Bug: 116527591
Test: Verified compilation.
Change-Id: I6ca2c89ed68ac190dc14a39ae4d9102632ad000a
2018-12-11 10:58:05 -08:00
Pengquan Meng
cd9df483d4 Merge "Modify constructor of NetworkRegistrationState" am: 61c09d128b
am: 070ab3d85e

Change-Id: Ia5ff1964024331eac272a8ef4e536153e942cd7f
2018-12-10 18:53:41 -08:00
Hall Liu
7d02a835ae Add fields for PhoneAccount to CallerInfo
Add fields to specify which outgoing phone account is stored in the
contacts db within the CallerInfo object.

Bug: 111455117
Test: manual, unit
Change-Id: Id402102e4605f6b414188a3eaf6442cf4282fcab
2018-12-10 18:46:07 -08:00