4664 Commits

Author SHA1 Message Date
Jeff Sharkey
a2790a13fd Fix the red build.
Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
(cherry picked from commit 29d670cea1c42d10274c5d97dcc8d2162540956e)
Merged-In: If035d6939f5a465b4b579b590f8f2b5b532e0951
2017-06-26 18:03:02 +00:00
Ying Xu
57ad8be7ec Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195
am: e30cfbea60

Change-Id: Iaff6653418289136e24b4a1c16ee4e607d30dca0
2017-06-26 17:36:15 +00:00
Ying Xu
e30cfbea60 Merge "Fix the inconsistency of scan status." am: 41be35a1bd
am: ac2d00a195

Change-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a
2017-06-26 17:27:21 +00:00
Ying Xu
ac2d00a195 Merge "Fix the inconsistency of scan status."
am: 41be35a1bd

Change-Id: Ic92aa1aa9ecd91cd072257c93e12cdf030cdeba8
2017-06-26 17:18:42 +00:00
Ying Xu
41be35a1bd Merge "Fix the inconsistency of scan status." 2017-06-26 17:05:59 +00:00
Pankaj Kanwar
70c1f55927 Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c
am: 01741762d8

Change-Id: I385f7ce854a52533251d3777e227aeaf695bb7db
2017-06-26 16:03:06 +00:00
Pankaj Kanwar
01741762d8 Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9
am: e26191a81c

Change-Id: I777010e6fea82f237ddf224525739a5687f13a2c
2017-06-26 15:55:46 +00:00
Pankaj Kanwar
e26191a81c Merge "Carrier Config changes to support IMSI encryption."
am: 1caaa514c9

Change-Id: Ia9c4d93e8ababf87a0d6027a4322e73111651844
2017-06-26 15:48:03 +00:00
pkanwar
766f4615e9 Carrier Config changes to support IMSI encryption.
Adding 2 config parameters to CarrierConfigManager:
1. imsi_key_download_url.
2. imsi_key_expiration_days_time.

BUG: 35606429
Test: manual

Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2
2017-06-25 19:46:52 -07:00
Jack Yu
429499f813 Merge "Refactored area update info support" into oc-dr1-dev
am: 5af2d63721

Change-Id: I1ab48412baffcbc6ad2b98ea0966cff20c9762aa
2017-06-24 04:47:36 +00:00
Hall Liu
2043f70acb Add download request tokens and enforce destination clear
Start writing tokens for each download request after calling download(),
and check agains them when a completed-file intent is received with a
download request extra.
Also start checking that the download destination is clear.

Change-Id: I533fe2ba49ac56bed5eab44670fe8e9a273b1ffb
2017-06-23 16:45:19 -07:00
Jack Yu
5af2d63721 Merge "Refactored area update info support" into oc-dr1-dev 2017-06-23 23:13:58 +00:00
yinxu
548475c58d Fix the inconsistency of scan status.
In types.hal and ril.h, the scan status is defined as:
    PARTIAL = 0x01
    COMPLETE = 0x02

But in NetworkScanResult.java, the scan status is defined as:
    public static final int SCAN_STATUS_PARTIAL = 0
    public static final int SCAN_STATUS_COMPLETE = 1

This CL makes changes to NetworkScanResult.java so that the scan status
is consistent both in Telephony and RIL.

Cherry-picked cleanly from:
https://android-review.googlesource.com/#/c/422183/

Test: Telephony sanity tests
Bug: 30954762

Merged-in: Iadcd344ad3fe682da98a1a41c2964583f67dc792
Change-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792
(cherry picked from commit ad50361ecec1844ddfb8a41097832a5cf0ecbb76)
2017-06-23 15:39:13 -07:00
yinxu
ad50361ece Fix the inconsistency of scan status.
In types.hal and ril.h, the scan status is defined as:
    PARTIAL = 0x01
    COMPLETE = 0x02

But in NetworkScanResult.java, the scan status is defined as:
    public static final int SCAN_STATUS_PARTIAL = 0
    public static final int SCAN_STATUS_COMPLETE = 1

This CL makes changes to NetworkScanResult.java so that the scan status
is consistent both in Telephony and RIL.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792
2017-06-23 15:30:22 -07:00
Chen Xu
95fbd2afef Merge "Handle invalid destination address gracefully" into oc-dr1-dev
am: 93ea43386e

Change-Id: I0e36a295ca481bb5c9b0fc77cb0d2e56d9cbfd0c
2017-06-23 21:43:59 +00:00
Jack Yu
93c4285623 Refactored area update info support
1. Refactored area update information support so it
   is not limited to channel 50 and Brazil.
2. Added channel 60 for India.

Test: Manual
bug: 37746109
Merged-In: Ic1c4683ecfe0556547ba15eb9b9e780644f17bff
Change-Id: Ic1c4683ecfe0556547ba15eb9b9e780644f17bff
2017-06-23 14:37:56 -07:00
Chen Xu
93ea43386e Merge "Handle invalid destination address gracefully" into oc-dr1-dev 2017-06-23 21:34:18 +00:00
Brad Ebinger
9b6accb762 Merge "Add method that checks the Binder status of ImsConfig" into oc-dr1-dev
am: beca22868c

Change-Id: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
2017-06-23 18:40:43 +00:00
Brad Ebinger
beca22868c Merge "Add method that checks the Binder status of ImsConfig" into oc-dr1-dev 2017-06-23 18:32:15 +00:00
fionaxu
b6c5aef338 Handle invalid destination address gracefully
Bug: 37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
2017-06-22 12:32:15 -07:00
fionaxu
35276a6696 resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp
Change-Id: I2cbfdd9b0fcf024509dbda84678ef067add014f9
2017-06-22 12:20:52 -07:00
Brad Ebinger
c24bc10f42 Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.

Bug: 62723694
Test: maual, follow bug procedure
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
2017-06-22 11:40:39 -07:00
fionaxu
187fe9d5cf resolve merge conflicts of 4ff3cf1eca71 to stage-aosp-master
am: ec573fddcb

Change-Id: I2a561ee6c35b339f5e1790a6995dc56e53933207
2017-06-21 21:50:47 +00:00
fionaxu
ec573fddcb resolve merge conflicts of 4ff3cf1eca71 to stage-aosp-master
Change-Id: Id8b10a739e6a313d74908d7fd7068d53ccf994a5
2017-06-21 13:50:51 -07:00
fionaxu
1c6027c156 migrate roaming operator configs to carrierconfig
Bug:37885668
Test:runtest --path
packages/apps/CarrierConfig/tests/src/com/android/carrierconfig/CarrierConfigTest.java
Change-Id: Ic669581243a7a640f9ac1b5155954514168cd14b
Merged-In: Ic669581243a7a640f9ac1b5155954514168cd14b
2017-06-21 17:18:38 +00:00
Amit Mahajan
94222f4c06 Make dun APNs as read-only by default.
Test: Verified tethering manually for T-Mo and AT&T
Bug: 38186417
Change-Id: Iae2beede0e20810cba4d96f897756896adf77b30
2017-06-20 11:42:53 -07:00
Hall Liu
1a47b93423 Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96 am: d974296f8c
am: b5475ab595

Change-Id: If6c24d1af51bd12ef52b546c610cb2b825c34f88
2017-06-19 20:35:44 +00:00
Hall Liu
b5475ab595 Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96
am: d974296f8c

Change-Id: I61d4f04ec27b0298c9ab77dd92bf14d44a1ed93f
2017-06-19 20:16:07 +00:00
Hall Liu
d974296f8c Merge changes from topics 'embms-init-fix', 'embms-download-2'
am: e601160a96

Change-Id: Icb84816dc98198ad6ed85dd8b030fbd0198d73a4
2017-06-19 20:03:42 +00:00
Hall Liu
e601160a96 Merge changes from topics 'embms-init-fix', 'embms-download-2'
* changes:
  Add callback for initialization done
  Embms download part 2
2017-06-19 19:53:41 +00:00
yinxu
f0b2b823c0 Use java.util.Objects.hashCode to get hashcode.
Cherry-picked cleanly from:
https://android-review.git.corp.google.com/#/c/415268/

Test: Telephony sanity tests

Merged-in: I8b845f2e5e44b242278b8955807d1b40e67e1414
Change-Id: I8b845f2e5e44b242278b8955807d1b40e67e1414
(cherry picked from commit 26439f5616be0f7894ed37e6952b3a6841d3b164)
2017-06-19 10:40:08 -07:00
Ying Xu
38529959bf Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev 2017-06-19 04:30:35 +00:00
Hall Liu
727a05b23e Add callback for initialization done
Add callback for initialization done in the framework, and listen to it
in the testapps. Make initialization asynchronous as well for both
download and streaming.

Change-Id: Iea7f803df9d2752401b2eca9f6c7375007cac35e
2017-06-16 18:58:57 -07:00
Hall Liu
fcbf24075d Embms download part 2
Add support for multi-part file downloads.
Improves destination directory handling in the download process.

Change-Id: Ibad57bab8804530ce09305424790d5520cd02071
2017-06-16 18:10:50 -07:00
Jeff Davidson
8f381f1cb4 Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev
am: 963a20772e

Change-Id: Ic64dff49ecec45c4c77486196a8661beec3b142f
2017-06-16 19:51:31 +00:00
Jeff Davidson
963a20772e Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev 2017-06-16 19:40:02 +00:00
yinxu
6488e3f891 Adds error codes and maximum RAN/Bands/Channels
Added error codes which are mapped from the RadioError which is returned
from RIL, also added some errors which will be generated at telephony.
Those errors will be returned to the user with the onError() callback.

Added the maximun number of RAN/Bands/Channels in 1 scan request.

Test: Telephony sanity tests
Bug: 30954762

Merged-in: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
Change-Id: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
(cherry picked from commit a88d1990b7482d94f20f2ba3d04a8eea8543e22d)
2017-06-16 10:16:39 -07:00
Tyler Gunn
5f661f9484 Merge "Add Telephony connection event for call forwarded supp service notice." into oc-dr1-dev
am: 7772487d98

Change-Id: I5503232f90b3255df601be3f16443e8ae311a479
2017-06-16 04:34:42 +00:00
Tyler Gunn
7772487d98 Merge "Add Telephony connection event for call forwarded supp service notice." into oc-dr1-dev 2017-06-16 04:24:54 +00:00
Jeff Davidson
b4c67ec3c8 Pass calling package to resolution UI.
The calling package is important for the UI to be able to tell the
user who is asking to perform the operation which needs consent. For
example, it should be able to tell the user which carrier app is
asking to download a profile.

Bug: 38049463
Test: TreeHugger + E2E verification
Change-Id: I890f811405cb05672e1271f092ddca60501e7ddc
2017-06-16 02:40:40 +00:00
Ying Xu
7682ce6076 Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2 am: c4f797652c
am: ce80092aaf

Change-Id: Iec9e028d5c05d427cc3b1f81e97defb873b13d64
2017-06-15 19:56:18 +00:00
Ying Xu
ce80092aaf Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2
am: c4f797652c

Change-Id: If7d2093b6ff24bffeeb75a6eb0e91d047b872dad
2017-06-15 19:44:45 +00:00
Ying Xu
c4f797652c Merge "Use java.util.Objects.hashCode to get hashcode."
am: 3890689bb2

Change-Id: I07e33a09f7ed2af457d2ad6261b5469b9dfd15c2
2017-06-15 16:59:59 +00:00
Jeff Davidson
7074cb84f0 Merge "eUICC API error code cleanup." into oc-dr1-dev
am: 93a59696ad

Change-Id: Ie12b3809b3819028965d50653db8147dadf3bcdb
2017-06-15 03:42:02 +00:00
yinxu
26439f5616 Use java.util.Objects.hashCode to get hashcode.
Test: Telephony sanity tests
Change-Id: I8b845f2e5e44b242278b8955807d1b40e67e1414
2017-06-14 10:54:05 -07:00
Ying Xu
830b8ecab2 Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1
am: aaca44229b

Change-Id: I9656821a325d000dde93e05987c29c76609578bc
2017-06-14 02:41:26 +00:00
Ying Xu
aaca44229b Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928
am: 707dc81da1

Change-Id: I37113bddb18b73dbf10b0dc9067dec9311338e86
2017-06-14 02:33:41 +00:00
Ying Xu
707dc81da1 Merge "Adds error codes and maximum RAN/Bands/Channels"
am: 70373f7928

Change-Id: I1c169772fb1335df4128b186e826f1bed1ca501d
2017-06-14 02:25:53 +00:00
Ying Xu
70373f7928 Merge "Adds error codes and maximum RAN/Bands/Channels" 2017-06-14 02:16:52 +00:00
Robert Greenwalt
c89ffbf12a Merge "Add updateMethod callback" am: a0974dbc0f am: 7791ac2e28
am: 01712b1aa6

Change-Id: I4b5b26081030f71e90022495e7a5cbb7811e5974
2017-06-13 21:11:43 +00:00