Commit Graph

4616 Commits

Author SHA1 Message Date
TreeHugger Robot
f43346c19e Merge "Refactored area update info support" 2017-06-23 19:08:57 +00:00
Brad Ebinger
d78dd2555e Merge "Add method that checks the Binder status of ImsConfig" into oc-dr1-dev am: beca22868c
am: 9b6accb762

Change-Id: I4d31d2474a58e29f2018f01eaa64036913b82892
2017-06-23 18:50:12 +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
Jack Yu
c6bf961305 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
Change-Id: Ic1c4683ecfe0556547ba15eb9b9e780644f17bff
2017-06-22 22:50:02 -07:00
fionaxu
35276a6696 resolve merge conflicts of 187fe9d5cf 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 4ff3cf1eca to stage-aosp-master
am: ec573fddcb

Change-Id: I2a561ee6c35b339f5e1790a6995dc56e53933207
2017-06-21 21:50:47 +00:00
fionaxu
ec573fddcb resolve merge conflicts of 4ff3cf1eca 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
Chen Xu
40b39c4bb7 Merge "migrate roaming operator configs to carrierconfig" 2017-06-21 00:23:21 +00:00
fionaxu
208fb629b6 migrate roaming operator configs to carrierconfig
Bug:37885668
Test:runtest --path
packages/apps/CarrierConfig/tests/src/com/android/carrierconfig/CarrierConfigTest.java
Change-Id: Ic669581243a7a640f9ac1b5155954514168cd14b
2017-06-20 12:12:42 -07:00
Hall Liu
3eb95c3b55 Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96 am: d974296f8c am: b5475ab595
am: 1a47b93423

Change-Id: Ic67525d9ffe4074f981bb2832ddc9226ce19e5e2
2017-06-19 20:53:17 +00: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 26439f5616)
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
08daf32950 Merge "Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev am: 963a20772e" into oc-dr1-dev-plus-aosp
am: 3806a1d477

Change-Id: I0af40ca1281103c1b82a8046339a42bb0cf3dc33
2017-06-16 20:11:39 +00: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 a88d1990b7)
2017-06-16 10:16:39 -07:00
Tyler Gunn
42e7611980 Merge "Add Telephony connection event for call forwarded supp service notice." into oc-dr1-dev am: 7772487d98
am: 5f661f9484

Change-Id: Id9f07a3d2bcac7e0d0d345b77d0856aa595239d6
2017-06-16 04:42:56 +00: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
Ying Xu
d5d2903307 Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2 am: c4f797652c am: ce80092aaf
am: 7682ce6076

Change-Id: I4a11cb67000324f9755c3cb6ab1d15dd6e23238b
2017-06-15 20:09:07 +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
efd7a8c0c0 Merge "eUICC API error code cleanup." into oc-dr1-dev am: 93a59696ad
am: 7074cb84f0

Change-Id: I71f401ce03c51a6c5b52ececda183f8a32433c9c
2017-06-15 03:49:31 +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
69a598b96c Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1 am: aaca44229b
am: 830b8ecab2

Change-Id: If2953e4ee5220809fdab50ddd4fc17c6ed80c3b4
2017-06-14 02:49:05 +00: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
770d68f445 Merge "Add updateMethod callback" am: a0974dbc0f am: 7791ac2e28 am: 01712b1aa6
am: c89ffbf12a

Change-Id: I77fbb003abd8d8aa7c6892dbb72ab6b5cd8798a4
2017-06-13 22:24:14 +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
Robert Greenwalt
01712b1aa6 Merge "Add updateMethod callback" am: a0974dbc0f
am: 7791ac2e28

Change-Id: I3402217fddc77d03b191ac7af0d938c6fa931486
2017-06-13 20:59:09 +00:00
Robert Greenwalt
7791ac2e28 Merge "Add updateMethod callback"
am: a0974dbc0f

Change-Id: I9dc2564d0856db617c0deb6bff35ca3cf6b6010c
2017-06-13 20:51:39 +00:00
Pankaj Kanwar
f13b8a78f6 Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: aadb414f02 am: 717b5bf3e0
am: 8532bc3b59

Change-Id: Idd49ae115d660cb21ed7baf4e66f5ec0f89e3e53
2017-06-13 20:50:15 +00:00
Robert Greenwalt
a0974dbc0f Merge "Add updateMethod callback" 2017-06-13 20:38:51 +00:00
Pankaj Kanwar
8532bc3b59 Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: aadb414f02
am: 717b5bf3e0

Change-Id: I8133ca2e269f74dd2c7b8a17f81de24567fcdc2e
2017-06-13 20:38:46 +00:00
Pankaj Kanwar
717b5bf3e0 Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
am: aadb414f02

Change-Id: I2f2189aa6483dfe17fe6ed7f42e8b23166c67444
2017-06-13 20:30:36 +00:00
yinxu
a88d1990b7 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
Change-Id: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
2017-06-13 13:27:39 -07:00
Jeff Davidson
f0d8c896c7 Define a meta-data attribute for a carrier icon.
This is just a centralized key that a carrier app and various eSIM
infrastructure can agree upon. It may be used to allow the carrier app
to show a custom icon instead of its launcher icon when some UI is
rendering the identity of the carrier. Use of this meta-data is
entirely up to callers.

Fixes: 62580015
Test: TreeHugger
Change-Id: Iaaab8cb8b5108d92b8f687d213daa7917f53fe65
2017-06-13 12:42:16 -07:00