Jack Yu
bc8cc99b20
Merge "Moved transport to IntDef" am: b7463a63d1
...
am: f713c1ff26
2019-03-15 16:40:23 -07:00
Jack Yu
f713c1ff26
Merge "Moved transport to IntDef"
...
am: b7463a63d1
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
2019-03-15 16:08:01 -07:00
Pengquan Meng
58fed7fac6
Merge "[API feedback] api fixed for getSlotMapping"
...
am: 9931252c3f
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
2019-03-15 13:18:47 -07:00
Sooraj Sasindran
5984d59e47
Provide network bands in AvailableNetworkInfo am: c9948da02a
...
am: 3e08825d4c
2019-03-15 13:13:26 -07:00
Sooraj Sasindran
f6b0d994a7
Merge changes from topic "Porting-ONSAPIChanges"
...
am: 31c7607ee6
2019-03-15 12:53:18 -07:00
Sooraj Sasindran
3e08825d4c
Provide network bands in AvailableNetworkInfo
...
am: c9948da02a
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
2019-03-15 09:25:22 -07:00
Cody Kesting
842fd65fe4
Merge "Fix ServiceState.hashCode() bug."
...
am: 466ff7b990
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
2019-03-14 18:06:24 -07:00
Paul Hu
4a862a637a
Merge "Rename some failed causes"
...
am: f6382802ef
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
2019-03-14 15:30:10 -07:00
Shuo Qian
614f1e0bba
Merge "Explain the difference of isValid, isActive, isUsable"
...
am: 9c649215f6
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
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
2019-03-13 18:13:58 -07:00
Chen Xu
3a720c6739
Merge "fix the issue that setPreferredNW send wrong RAT to HAL"
...
am: 4837dbe536
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
2019-03-13 15:08:01 -07:00
Iris Chang
52688c33ee
Merge "Should return the number of supported SIM cards"
...
am: 09a4ee1988
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
2019-03-13 10:45:36 -07:00
Leland Miller
83c77f688a
Merge "Annotate Parcelable CREATOR fields as @NonNull"
...
am: 8ced10ec23
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
2019-03-12 23:13:05 -07:00
Xiangyu/Malcolm Chen
c078d39d46
Merge "Only return one mobile subscription per group in Settings."
...
am: 58385e9796
2019-03-12 22:35:39 -07:00
Josh Hou
8d19949c4c
Merge "add NonNull annotation to API" am: 56c9d22970
...
am: 69e802e6e6
2019-03-12 21:55:13 -07:00
Josh Hou
69e802e6e6
Merge "add NonNull annotation to API"
...
am: 56c9d22970
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
Xiangyu/Malcolm Chen
0a0213e493
Merge "Don't return hidden subscription in getActiveSubIdList" am: d2cb5a0608
...
am: 851ec326d9
2019-03-12 16:36:02 -07:00
Xiangyu/Malcolm Chen
1eb9df2088
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList." am: 8cbe957dba
...
am: 6dc894e962
2019-03-12 16:25:18 -07:00
Nathan Harold
53fb0789fb
Merge "[API Feedback] Rename DebugEventReporter" am: 3a6dcad0a3
...
am: e80b170949
2019-03-12 16:12:08 -07:00
Xiangyu/Malcolm Chen
851ec326d9
Merge "Don't return hidden subscription in getActiveSubIdList"
...
am: d2cb5a0608
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
Xiangyu/Malcolm Chen
6dc894e962
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."
...
am: 8cbe957dba
2019-03-12 15:55:53 -07:00
Xiangyu/Malcolm Chen
8cbe957dba
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."
2019-03-12 22:40:39 +00:00
Nathan Harold
e80b170949
Merge "[API Feedback] Rename DebugEventReporter"
...
am: 3a6dcad0a3
2019-03-12 15:38:26 -07:00
