Commit Graph

7752 Commits

Author SHA1 Message Date
Jordan Liu
dc0ac4fa83 Merge "Add slot based ICC channel APIs" am: e278d2bcdd
am: ca075c3176

Change-Id: Ia43d743a06f21a812f74f98541e618f627dcf4a7
2019-03-18 13:56:12 -07:00
Brad Ebinger
8f1a1f83dc Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs" am: b50cea987b
am: 19aa681ad5

Change-Id: I41fbf2df61f1156b231189730690c9d48c04c3c4
2019-03-18 13:41:22 -07:00
Jordan Liu
ca075c3176 Merge "Add slot based ICC channel APIs"
am: e278d2bcdd

Change-Id: Ifaaddfc58ee684393bcabfc214d72746125ed158
2019-03-18 13:38:37 -07:00
Brad Ebinger
19aa681ad5 Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs"
am: b50cea987b

Change-Id: I958118cbf6bbe1da784e970b8b2195c52e198855
2019-03-18 13:28:10 -07:00
Jordan Liu
e278d2bcdd Merge "Add slot based ICC channel APIs" 2019-03-18 18:36:54 +00:00
Brad Ebinger
b50cea987b Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs" 2019-03-18 17:35:27 +00:00
Jack Yu
bc8cc99b20 Merge "Moved transport to IntDef" am: b7463a63d1
am: f713c1ff26

Change-Id: I9a68e86efd37018db87dfb09af58fba8b99c3b15
2019-03-15 16:40:23 -07:00
Jack Yu
f713c1ff26 Merge "Moved transport to IntDef"
am: b7463a63d1

Change-Id: I80d2bf5b3d195d4b05135006418ba4b638271f4f
2019-03-15 16:31:06 -07:00
Treehugger Robot
b7463a63d1 Merge "Moved transport to IntDef" 2019-03-15 23:21:29 +00:00
Pengquan Meng
91ae15122f Merge "[API feedback] api fixed for getSlotMapping" am: 9931252c3f
am: 58fed7fac6

Change-Id: I858a9014859f6c44862165cc7a970bdc20176fe4
2019-03-15 16:08:01 -07:00
Pengquan Meng
58fed7fac6 Merge "[API feedback] api fixed for getSlotMapping"
am: 9931252c3f

Change-Id: I68489daa92188232f3d1489226f71c14d5b2b14d
2019-03-15 15:58:45 -07:00
Pengquan Meng
9931252c3f Merge "[API feedback] api fixed for getSlotMapping" 2019-03-15 22:38:46 +00:00
Sooraj Sasindran
acf23ad83e Merge changes from topic "Porting-ONSAPIChanges" am: 31c7607ee6
am: f6b0d994a7

Change-Id: Idf128d17a2fac096ca5e28000648638c1d70fff2
2019-03-15 13:18:47 -07:00
Sooraj Sasindran
5984d59e47 Provide network bands in AvailableNetworkInfo am: c9948da02a
am: 3e08825d4c

Change-Id: Ibdfb3a26f2aea6d4c53a157b9045a9f3dca09176
2019-03-15 13:13:26 -07:00
Sooraj Sasindran
f6b0d994a7 Merge changes from topic "Porting-ONSAPIChanges"
am: 31c7607ee6

Change-Id: Ibca8c0202ff702be57f128b0cc24a8679d0a8083
2019-03-15 12:53:18 -07:00
Sooraj Sasindran
3e08825d4c Provide network bands in AvailableNetworkInfo
am: c9948da02a

Change-Id: Ib7ba8c29f8e8ed7237b5afcccf9d1694596f1263
2019-03-15 12:46:05 -07:00
Sooraj Sasindran
31c7607ee6 Merge changes from topic "Porting-ONSAPIChanges"
* changes:
  Should not turn on validation for data
  Provide network bands in AvailableNetworkInfo
2019-03-15 19:31:55 +00:00
Cody Kesting
11d091f9da Merge "Fix ServiceState.hashCode() bug." am: 466ff7b990
am: 842fd65fe4

Change-Id: I968a368b97d74bb8f228df38cb8c0700ccb9b4b4
2019-03-15 09:25:22 -07:00
Cody Kesting
842fd65fe4 Merge "Fix ServiceState.hashCode() bug."
am: 466ff7b990

Change-Id: I9705b0857ecc5f9a809e7e640fbc35151d244211
2019-03-15 09:11:09 -07:00
Cody Kesting
99ef1d40dc Fix ServiceState.hashCode() bug.
ServiceState currently overrides hashCode() incorrectly. It hashes an
Array field without using Arrays.hashCode(), meaning that the default
Object.hashCode() implementation is used (which is based on the address
of the Array field). This allows equivalent ServiceState instances to
produce different hashes.

Bug: 128609620
Test: atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: I40a7d0b7ebab6d2a1be47ea63a6d223c4c13700b
2019-03-15 15:46:09 +00:00
Jack Yu
6f7b30499c Moved transport to IntDef
Moved out from the sub class per API review feedback.

Test: Build
Bug: 128607082
Merged-In: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
Change-Id: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
2019-03-14 20:32:16 -07:00
Paul Hu
8a8c74e131 Merge "Rename some failed causes" am: f6382802ef
am: 4a862a637a

Change-Id: I0b9b904da6749028a6c8441550583a15a7acde4e
2019-03-14 18:06:24 -07:00
Paul Hu
4a862a637a Merge "Rename some failed causes"
am: f6382802ef

Change-Id: I01b6d267c4b2cbf23d6cdc2dea770f5da99fa155
2019-03-14 17:56:12 -07:00
Paul Hu
f6382802ef Merge "Rename some failed causes" 2019-03-15 00:43:42 +00:00
Shuo Qian
a2d4a163db Merge "Explain the difference of isValid, isActive, isUsable" am: 9c649215f6
am: 614f1e0bba

Change-Id: Ia4f968479973a9fb5f1ccdf78145d7fc2429ef0a
2019-03-14 15:30:10 -07:00
Shuo Qian
614f1e0bba Merge "Explain the difference of isValid, isActive, isUsable"
am: 9c649215f6

Change-Id: I8146a074fa87747e91a22da4a4bfb696dcc7deef
2019-03-14 15:20:03 -07:00
Shuo Qian
9c649215f6 Merge "Explain the difference of isValid, isActive, isUsable" 2019-03-14 22:05:46 +00:00
Brad Ebinger
af5f2a5f52 Integrate FEATURE_TELEPHONY_IMS feature into APIs
Bug: 118823732
Test: manual
Merged-In: Iabb0e7cadae52d8ebe922f61a878298ad4dd04b0
Change-Id: Iabb0e7cadae52d8ebe922f61a878298ad4dd04b0
2019-03-14 14:57:00 -07:00
Jordan Liu
118895f571 Add slot based ICC channel APIs
These are SystemApis which require MODIFY_PHONE_STATE, and can be used
to open ICC channels when there is no available subscription, using the
slot index instead of subId.

Bug: 126578014
Test: builds
Change-Id: I3f47a8ac07813ea9e326c7d76123352708bfeea2
Merged-In: I3f47a8ac07813ea9e326c7d76123352708bfeea2
2019-03-14 14:25:25 -07:00
sqian
0bcdd6cbd4 Explain the difference of isValid, isActive, isUsable
Bug: 118675257
Test: compile
Change-Id: Ibec1bf7929991ca0e2910684f5216ab8372d4e95
2019-03-14 11:34:01 -07:00
Chen Xu
c7fb8914b6 Merge "fix the issue that setPreferredNW send wrong RAT to HAL" am: 4837dbe536
am: 3a720c6739

Change-Id: I2245e9a0fd7afac8835dbf1ead499153efa39e36
2019-03-13 18:13:58 -07:00
Chen Xu
3a720c6739 Merge "fix the issue that setPreferredNW send wrong RAT to HAL"
am: 4837dbe536

Change-Id: I33e98b0f4ac9b0d7130b9e6b25fec5b76409e021
2019-03-13 18:04:44 -07:00
Chen Xu
4837dbe536 Merge "fix the issue that setPreferredNW send wrong RAT to HAL" 2019-03-14 00:47:07 +00:00
Sooraj Sasindran
3b09d711f9 Should not turn on validation for data
Should not turn on validation for data switch every time.
Provide result as a callback

Test: verified manually
Bug: 126264455
Merged-In: I5df2311d91fdab34563148b4466163696e52faf9
Change-Id: I5df2311d91fdab34563148b4466163696e52faf9
2019-03-13 15:36:11 -07:00
Iris Chang
88768902b3 Merge "Should return the number of supported SIM cards" am: 09a4ee1988
am: 52688c33ee

Change-Id: I122d3f77a55ae27005531bfe490ad35213892b4f
2019-03-13 15:08:01 -07:00
Iris Chang
52688c33ee Merge "Should return the number of supported SIM cards"
am: 09a4ee1988

Change-Id: Ia8d237fa510ca47c4fcd04a7d28812612e01d248
2019-03-13 14:57:06 -07:00
Sooraj Sasindran
c9948da02a Provide network bands in AvailableNetworkInfo
Provide network bands in AvailableNetworkInfo

Test: verified using CTS and make
Bug: 123292899
Merged-In: I0d0a180eb4da3edf50a94ba621505ad95c7a262c
Change-Id: I0d0a180eb4da3edf50a94ba621505ad95c7a262c
2019-03-13 14:34:04 -07:00
Treehugger Robot
09a4ee1988 Merge "Should return the number of supported SIM cards" 2019-03-13 21:18:57 +00:00
chen xu
14778d38e8 fix the issue that setPreferredNW send wrong RAT to HAL
Bug: 126805258
Test: Manual test to set LTE only mode
Change-Id: I2e88d3bc22ca8d1e626bf381840cc80f832a8b3f
2019-03-13 13:34:00 -07:00
Leland Miller
826516c579 Merge "Annotate Parcelable CREATOR fields as @NonNull" am: 8ced10ec23
am: 83c77f688a

Change-Id: Idbe3b03a8345db85b7e32d4e7198a78c1df42270
2019-03-13 10:45:36 -07:00
Leland Miller
83c77f688a Merge "Annotate Parcelable CREATOR fields as @NonNull"
am: 8ced10ec23

Change-Id: I89a5c242a85c0e0d19f98fc5db9fa87b0a48815a
2019-03-13 10:35:32 -07:00
Leland Miller
8ced10ec23 Merge "Annotate Parcelable CREATOR fields as @NonNull" 2019-03-13 17:23:12 +00:00
Iris Chang
f0026eebfc Should return the number of supported SIM cards
When multiple SIM is enabled, getSimCount() in TelephonyManager.java
just returns 2 and it is not consistent with getPhoneCount(). For
devices which support more than 2 SIMs, it will cause
ArrayIndexOutOfBoundsException in the getInstance() function of CatService.java
when thress SIMs are present. To fix this issue, we need to return
the phone count in getSimCount() to synchronize both APIs.

Bug: 126292874
Test: check if JE is fixed on a device which supports 3 SIMs
Change-Id: I227f7d05349c1d0cf4c8bfa46c4e3b5f9bd42be9
2019-03-13 15:40:43 +08:00
Xiangyu/Malcolm Chen
7499f3a1c4 Merge "Only return one mobile subscription per group in Settings." am: 58385e9796
am: c078d39d46

Change-Id: I748be95d8cf99ac03457ac740829cf5855331444
2019-03-12 23:13:05 -07:00
Xiangyu/Malcolm Chen
c078d39d46 Merge "Only return one mobile subscription per group in Settings."
am: 58385e9796

Change-Id: I2133bd9ba315a862a25fdd65afd981cbe34d5e62
2019-03-12 22:35:39 -07:00
Josh Hou
8d19949c4c Merge "add NonNull annotation to API" am: 56c9d22970
am: 69e802e6e6

Change-Id: Ieed6eba51fc2c3fdf7823415c783482a77c2d29c
2019-03-12 21:55:13 -07:00
Josh Hou
69e802e6e6 Merge "add NonNull annotation to API"
am: 56c9d22970

Change-Id: Iaa22836680e45c4244a4380d9688b968b7877c8e
2019-03-12 21:26:18 -07:00
Malcolm Chen
b82864c801 Only return one mobile subscription per group in Settings.
Right now getSelectableSubscriptionInfoList returns all subscriptions
that are visible and available. But we should only show one per
subscription group. So updating getSelectableSubscriptionInfoList
to make sure of it.

Bug: 126438122
Test: manual - group Fi primary subscriptions and make sure only
one Fi subscription is shown in Settings UI.
Change-Id: I867296b4f8efbdf2e9885ef34dd45806fa0abbca
Merged-In: I867296b4f8efbdf2e9885ef34dd45806fa0abbca
2019-03-13 04:14:07 +00:00
Josh Hou
56c9d22970 Merge "add NonNull annotation to API" 2019-03-13 00:58:21 +00:00
Jordan Liu
0fd9d60cea Merge "Add carrier's option to cancel CS reject cause notification" into pi-dev-plus-aosp 2019-03-13 00:10:31 +00:00