Commit Graph

6151 Commits

Author SHA1 Message Date
Ecco Park
331411f945 Merge "carrier-config: define imsi_eap_identity_sequence_int key" 2019-04-03 12:56:05 +00:00
Brad Ebinger
3a3e3bc4a8 Merge "Change UT to disabled by default" am: 3c1a889a9c am: 94c06c609a
am: 5e6235db9a

Change-Id: Icd039f27190c07e74a046e0b9f7a9b447346ab8f
2019-04-02 19:06:26 -07:00
Brad Ebinger
5e6235db9a Merge "Change UT to disabled by default" am: 3c1a889a9c
am: 94c06c609a

Change-Id: I930b6873fcc24aebcf430f356bc1002db665ce5d
2019-04-02 18:39:55 -07:00
Brad Ebinger
94c06c609a Merge "Change UT to disabled by default"
am: 3c1a889a9c

Change-Id: Id0e575b3e17515667371ff626a4423e1cb82b2c0
2019-04-02 18:05:12 -07:00
Treehugger Robot
3c1a889a9c Merge "Change UT to disabled by default" 2019-04-02 23:21:31 +00:00
Xiangyu/Malcolm Chen
d6ecaf064c Merge "Changing default phone capability." 2019-04-02 22:22:33 +00:00
Jack Yu
2bcdbd1b79 Merge "Correctly support LTE carrier aggregation" 2019-04-02 21:18:04 +00:00
Jack Yu
2e273b2f0f Passing ServiceState as byte array into ServiceStateProvider
This allows the provider to reconstruct the service state
object correctly. Also we can get rid of all the 'set'
methods in ServiceState, which we'd like to remove in the future.

Test: Manual
Bug: 129768354
Change-Id: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
2019-04-02 11:27:34 -07:00
Jack Yu
05a6543248 Correctly support LTE carrier aggregation
NetworkRegistrationInfo.getAccessNetworkTechnology() should
report LTE as the network type when modem reports the RAT
LTE_CA. Fixed by adding a flag in data specific registration
info.

Test: Manual
Bug: 129707180
Change-Id: Ib152f97711441fded998a36528ef007f9e28ccbf
2019-04-02 11:09:43 -07:00
Xiangyu/Malcolm Chen
4e578310f8 Merge "API Feedback for CBRS" am: 9c706654a2
am: f9edc9fffd

Change-Id: I7c449a129ab8bd759b40e0aa0a429dd7847ef755
2019-04-01 19:26:11 -07:00
Xiangyu/Malcolm Chen
f9edc9fffd Merge "API Feedback for CBRS"
am: 9c706654a2

Change-Id: I6a6d0a81100093696fc6e4b66b32e34dbed49913
2019-04-01 19:10:02 -07:00
Xiangyu/Malcolm Chen
9c706654a2 Merge "API Feedback for CBRS" 2019-04-02 01:46:19 +00:00
Hall Liu
516b07ee2c Merge "Add a new carrier config to show the WFC location privacy policy UI" am: 4c508d1b03
am: d94791b712

Change-Id: I435a8b653960e07931bb8c0c11fad3f805431dc6
2019-04-01 17:24:01 -07:00
Hall Liu
d94791b712 Merge "Add a new carrier config to show the WFC location privacy policy UI"
am: 4c508d1b03

Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6
2019-04-01 16:34:30 -07:00
Hall Liu
4c508d1b03 Merge "Add a new carrier config to show the WFC location privacy policy UI" 2019-04-01 22:55:51 +00:00
Malcolm Chen
4674a797e9 API Feedback for CBRS
Bug: 128902411
Test: unittest
Change-Id: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Merged-In: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
2019-04-01 15:23:53 -07:00
Xiangyu/Malcolm Chen
65d4295c3c Merge "Remove clearDefaultsForInactiveSubIds." am: 1e263e7bc0
am: 4e32ac7754

Change-Id: I8c21ba73807837f999bf3fcc7fbef1d24c7500da
2019-04-01 14:31:06 -07:00
Hall Liu
5b4ad4fa6d Allow requestNetworkScan to return sanitized info am: c9d7430685 am: 87217889f1
am: 9e1d425b58

Change-Id: I3fab8c08100a68aba55eefb27b587e73849bc108
2019-04-01 14:29:04 -07:00
Hall Liu
9e1d425b58 Allow requestNetworkScan to return sanitized info am: c9d7430685
am: 87217889f1

Change-Id: I601304e6eaedef27a2adc413084e6a240a5e9b97
2019-04-01 14:08:39 -07:00
Xiangyu/Malcolm Chen
4e32ac7754 Merge "Remove clearDefaultsForInactiveSubIds."
am: 1e263e7bc0

Change-Id: I8fb91dd4928cf8a607a876cc304c261bfb762a59
2019-04-01 14:05:57 -07:00
Xiangyu/Malcolm Chen
1e263e7bc0 Merge "Remove clearDefaultsForInactiveSubIds." 2019-04-01 20:51:54 +00:00
Hall Liu
87217889f1 Allow requestNetworkScan to return sanitized info
am: c9d7430685

Change-Id: I91b315cd48095345f34755cc13d059158982a960
2019-04-01 13:47:42 -07:00
Hall Liu
f276a56215 Merge changes from topics "nw-scan-cts", "nw-scan-changes"
* changes:
  Add shell permissions for CTS testing
  Allow requestNetworkScan to return sanitized info
2019-04-01 20:31:10 +00:00
Ecco Park
6d3e2948fb carrier-config: define imsi_eap_identity_sequence_int key
Some of Carrier Wi-Fi Networks doesn't support receiving encrypted-IMSI
as EAP-RESPONSE/IDENTITY due to network deployment architecture.

So, a new key is required to define a sequence of sending encrypted-IMSI
identity during EAP-SIM/AKA authentication.
If this value is 2, anonymous@<realm> will be sent as a
EAP-RESPONSE/IDENTITY first and followd by
encrypted IMSI as EAP-RESPONSE/AKA|SIM-IDENTITY.
1: encrypted-IMSI (default one)
2: anonymous -> encrypted-IMSI.

Bug: 109795427
Test: manual
Change-Id: I1121f21b771707ed7c8350826cefc43445f4fc8b
Signed-off-by: Ecco Park <eccopark@google.com>
2019-03-30 08:13:45 -07:00
Malcolm Chen
938dc54b57 Remove hidden IntDef in java doc.
Bug: 128456336
Test: build
Change-Id: If016aabda5092d299eca2e858f26057614767297
2019-03-29 18:55:01 -07:00
Sooraj Sasindran
a783041e08 Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds"" am: 92e99a6ca9 am: c6c093e778
am: 6c7d65384a

Change-Id: Iad7e00fb64835eb14061eac0d90c2d4d96a56fac
2019-03-29 18:23:28 -07:00
Sooraj Sasindran
6c7d65384a Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds"" am: 92e99a6ca9
am: c6c093e778

Change-Id: I8e5ab63be21b97077ecd263f12581b120e3f85e2
2019-03-29 18:14:27 -07:00
Sooraj Sasindran
c6c093e778 Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds""
am: 92e99a6ca9

Change-Id: I7ce860cdca34cf4ff421384fe3071b9f13dc427b
2019-03-29 18:06:00 -07:00
Treehugger Robot
92e99a6ca9 Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds"" 2019-03-30 00:53:23 +00:00
Brad Ebinger
440d168834 Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change" am: 4ae4e50def am: f15dabde00
am: 511f86aa55

Change-Id: Id46383f86fe31460d8fde22e5e572e016e065fb7
2019-03-29 17:19:04 -07:00
Sooraj Sasindran
6633c57fa0 Revert "Change Values for Opportunistic Entry & Exit Thresholds"
This reverts commit f0c8f19325.

Reason for revert: From further test, we see sharp decline in data throughput

Change-Id: I0fb031a8adf15d3a0149651bcc51ee1d7318a42e
2019-03-30 00:07:33 +00:00
Brad Ebinger
511f86aa55 Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change" am: 4ae4e50def
am: f15dabde00

Change-Id: I13573f02a8b14fe695222cced5e8fbfa493ed733
2019-03-29 16:58:32 -07:00
Brad Ebinger
f15dabde00 Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change"
am: 4ae4e50def

Change-Id: Iefa6fdcfaa5e3efbfebcf403d284acf569d45ab2
2019-03-29 16:23:24 -07:00
Xiangyu/Malcolm Chen
2e0ea1ab5e Merge changes from topics "128455935", "123661746" am: dc4cb81c83
am: 1c906d426d

Change-Id: I745f66fc63d03e2ccf03b47daae56f219252d87b
2019-03-29 15:57:11 -07:00
Treehugger Robot
4ae4e50def Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change" 2019-03-29 22:52:00 +00:00
Malcolm Chen
37c9ced0e6 Remove SubscriptionManager#setMetered API. am: 9b932fa1a4
am: 8231d3b231

Change-Id: Ic00503fca6ef09ac2cda1cf0388d199d2190c1f3
2019-03-29 15:45:36 -07:00
Xiangyu/Malcolm Chen
1c906d426d Merge changes from topics "128455935", "123661746"
am: dc4cb81c83

Change-Id: I4b169adb007ecff072770f55490bac8b5c30b4c5
2019-03-29 15:28:34 -07:00
Malcolm Chen
8231d3b231 Remove SubscriptionManager#setMetered API.
am: 9b932fa1a4

Change-Id: I55b74e102d77785e7f925d02049037b24a5d352a
2019-03-29 15:21:07 -07:00
Xiangyu/Malcolm Chen
dc4cb81c83 Merge changes from topics "128455935", "123661746"
* changes:
  Better description and parameter name of setPreferredDataSubscriptionId
  Remove SubscriptionManager#setMetered API.
2019-03-29 21:48:10 +00:00
Malcolm Chen
60cc67f5ac Remove clearDefaultsForInactiveSubIds.
clearDefaultsForInactiveSubIds is no longer needed as Telephony
has internal logic to clear or update default settings automatically.

Bug: 128645056
Test: manual
Change-Id: Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9
Merged-In: Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9
2019-03-29 14:41:59 -07:00
Shuo Qian
53b205a5f9 Merge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged" am: 801cd8ff8a
am: 27da4d70d4

Change-Id: Id48a47b0f0a9e314790013f471e7c57d4a71692a
2019-03-29 13:38:40 -07:00
Shuo Qian
27da4d70d4 Merge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged"
am: 801cd8ff8a

Change-Id: I15ce52efcea9b00cfe8ea5190aa58457386528b1
2019-03-29 13:29:26 -07:00
Brad Ebinger
099d985844 Do not show SMS SIM pick UI for Cell Broadcast Config change
If the user did not pick their default SIM subscription for
SMS, we were showing many dialogs to the user whenever
SmsManager#getSubscriptionId was called for cell broadcast
related APIs.

Instead, if we instantiate the SmsManager using
SmsManager.getDefault() and the user has not set a default,
use the default Phone and do not show SIM picker activity
(consistent with legacy implementation).

Bug: 129315610
Test: set up DSDS, disable eSIM operator in settings
Change-Id: I3cc4839632eede75c8943836432b07978d0efda0
2019-03-29 13:23:11 -07:00
Brad Ebinger
78c48443b4 Merge "Change ProvisioningManager API as per review" am: 54fffdc876 am: 8dd52036bc
am: 8d6a06325b

Change-Id: Ib202ef3afd7c85150ba3b51bdbf16800593d18ed
2019-03-29 12:10:22 -07:00
Brad Ebinger
8d6a06325b Merge "Change ProvisioningManager API as per review" am: 54fffdc876
am: 8dd52036bc

Change-Id: Ic4b23f973e880563a25be6daf7f482504a1326c6
2019-03-29 11:53:54 -07:00
Brad Ebinger
8dd52036bc Merge "Change ProvisioningManager API as per review"
am: 54fffdc876

Change-Id: Ic108caf282809306a6f70e009055f6bc91b352c0
2019-03-29 11:42:42 -07:00
Shuo Qian
b18e114c41 Merge "Emergency Number format" am: e5709bf75f
am: 9c9d146ab4

Change-Id: I5f06b1955814144fd2e86092bbb9b8b85cbf54c9
2019-03-29 11:39:42 -07:00
sqian
7cf1017c39 Check permissions and carrier privilege in notifyActiveDataSubIdChanged
Bug: 127978132
Test: Treehugger
Merged-In: I1d9c5d1b242953a2af3e56718ef82761941d8d9c
(cherry picked from commit 9e9ed18772)

Change-Id: Ia25472063d6f42c36f429e725d364ecf4f16fec1
2019-03-29 11:35:29 -07:00
Shuo Qian
9c9d146ab4 Merge "Emergency Number format"
am: e5709bf75f

Change-Id: I335cd4ebe8974915f0af1162bdca42029b3afb98
2019-03-29 11:30:46 -07:00
Brad Ebinger
54fffdc876 Merge "Change ProvisioningManager API as per review" 2019-03-29 18:23:35 +00:00