Commit Graph

5869 Commits

Author SHA1 Message Date
TreeHugger Robot
a2ca4fa104 Merge "Add annotation for EuiccManager#updateSubscriptionNickname." 2019-03-15 23:23:25 +00:00
Jack Yu
e4edae3798 Merge "Moved transport to IntDef" 2019-03-15 21:16:42 +00:00
Shuo Qian
d5487a5828 Merge "Emergency Number format" 2019-03-15 19:33:17 +00:00
Cody Kesting
a49171ea5c Merge "Fix ServiceState.hashCode() bug." am: 466ff7b990 am: 842fd65fe4
am: 11d091f9da

Change-Id: Idab8b65c1b71d25c71db12928d363e9e28b4f662
2019-03-15 09:40:27 -07: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
sqian
0197a96e8a Emergency Number format
Use PhoneNumberUtils#isDialable to check each character.

Bug: 123241078
Test: Treehugger
Change-Id: Icc9083ed4d6cdae22c3ede9433433ac8eeec4918
2019-03-14 19:42:38 -07:00
Jack Yu
ef25faf013 Moved transport to IntDef
Moved out from the sub class per API review feedback.

Test: Build
Bug: 128607082
Change-Id: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
2019-03-14 19:24:49 -07:00
Paul Hu
c5cb20acfd Merge "Rename some failed causes" am: f6382802ef am: 4a862a637a
am: 8a8c74e131

Change-Id: Ibbedb611b805b9b2e39bf1dd2f3ea20940504f8e
2019-03-14 18:18:06 -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
53df1e44ff Merge "Explain the difference of isValid, isActive, isUsable" am: 9c649215f6 am: 614f1e0bba
am: a2d4a163db

Change-Id: I6f1632a89a5e66427938286bb1e96c63b8392ed9
2019-03-14 15:40:47 -07: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
Qingxi Li
9ac2e1469e Merge "Update the javadoc of EXTRA_FORCE_PROVISION" 2019-03-14 22:25:00 +00: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
8556a2c025 Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs" 2019-03-14 21:23:56 +00:00
Pengquan Meng
4c2eee46e3 Merge "[API feedback] fixed API for NR" 2019-03-14 20:36:03 +00:00
Qingxi Li
4b52777705 Update the javadoc of EXTRA_FORCE_PROVISION
Bug: 126726760
Test: TreeHugger
Change-Id: I87a315513b07c1f935efa6a50278610fab65e193
2019-03-14 12:54:27 -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
c776889550 Merge "fix the issue that setPreferredNW send wrong RAT to HAL" am: 4837dbe536 am: 3a720c6739
am: c7fb8914b6

Change-Id: Ibc3e52b0a109843808a6042a3e41530f1fdf5a17
2019-03-13 18:23:29 -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
Iris Chang
f0c8fcb53c Merge "Should return the number of supported SIM cards" am: 09a4ee1988 am: 52688c33ee
am: 88768902b3

Change-Id: Iaa5c55924d46726ed8df67828040431249883ae6
2019-03-13 15:23:27 -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
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
Jordan Liu
7c0ad50543 Merge "Add slot based ICC channel APIs" 2019-03-13 05:29:20 +00:00
Josh Hou
7a0d2a2519 Merge "add NonNull annotation to API" am: 56c9d22970 am: 69e802e6e6
am: 8d19949c4c

Change-Id: I92bad21050b4396d1bb3588cd42d78a1c662903c
2019-03-12 22:10:54 -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
Nathan Harold
b0ec15dc03 Merge "[API Feedback] Rename DebugEventReporter" am: 3a6dcad0a3 am: e80b170949
am: 53fb0789fb

Change-Id: If7d117810bd56d6057cb99e79f52def579b5a089
2019-03-12 16:37:57 -07:00
Xiangyu/Malcolm Chen
0a0213e493 Merge "Don't return hidden subscription in getActiveSubIdList" am: d2cb5a0608
am: 851ec326d9

Change-Id: I9356cfd364f7a9d65c299a10d9aea37f1d3d79de
2019-03-12 16:36:02 -07:00
Xiangyu/Malcolm Chen
1eb9df2088 Merge "Don't return hidden subscription in getActiveSubscriptionInfoList." am: 8cbe957dba
am: 6dc894e962

Change-Id: Idc50eab22bc89207868349a96dfbc38783125165
2019-03-12 16:25:18 -07:00
Nathan Harold
53fb0789fb Merge "[API Feedback] Rename DebugEventReporter" am: 3a6dcad0a3
am: e80b170949

Change-Id: I2c458c5a5fa2b1f47f9bc92e89a7385ca35d877d
2019-03-12 16:12:08 -07:00
Xiangyu/Malcolm Chen
851ec326d9 Merge "Don't return hidden subscription in getActiveSubIdList"
am: d2cb5a0608

Change-Id: Ie8d0998a15b2fa905ba5073f47badf51afd1154a
2019-03-12 16:12:05 -07:00
Xiangyu/Malcolm Chen
d2cb5a0608 Merge "Don't return hidden subscription in getActiveSubIdList" 2019-03-12 22:59:00 +00:00