Jeff Davidson
5526fa1ce7
Merge "Pass calling package to resolution UI." into oc-dr1-dev am: 776220d029
...
am: f60773b22d
2017-06-27 01:00:05 +00:00
Jeff Davidson
f60773b22d
Merge "Pass calling package to resolution UI." into oc-dr1-dev
...
am: 776220d029
2017-06-27 00:53:58 +00:00
TreeHugger Robot
776220d029
Merge "Pass calling package to resolution UI." into oc-dr1-dev
2017-06-27 00:48:39 +00:00
Ying Xu
231e291b06
Merge "Fix the inconsistency of scan status." into oc-dr1-dev
2017-06-26 23:10:00 +00:00
Jeff Sharkey
a2790a13fd
Fix the red build.
...
Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
(cherry picked from commit 29d670cea1
2017-06-26 18:03:02 +00:00
Ying Xu
487893dada
Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195 am: e30cfbea60
...
am: 57ad8be7ec
2017-06-26 17:45:41 +00:00
Ying Xu
57ad8be7ec
Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195
...
am: e30cfbea60
2017-06-26 17:36:15 +00:00
Ying Xu
e30cfbea60
Merge "Fix the inconsistency of scan status." am: 41be35a1bd
...
am: ac2d00a195
2017-06-26 17:27:21 +00:00
Ying Xu
ac2d00a195
Merge "Fix the inconsistency of scan status."
...
am: 41be35a1bd
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
Jeff Sharkey
29d670cea1
Fix the red build.
...
Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
2017-06-26 11:02:41 -06:00
Pankaj Kanwar
a1b99b1b29
Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c am: 01741762d8
...
am: 70c1f55927
2017-06-26 16:10:40 +00:00
Pankaj Kanwar
70c1f55927
Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c
...
am: 01741762d8
2017-06-26 16:03:06 +00:00
Pankaj Kanwar
01741762d8
Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9
...
am: e26191a81c
2017-06-26 15:55:46 +00:00
Pankaj Kanwar
e26191a81c
Merge "Carrier Config changes to support IMSI encryption."
...
am: 1caaa514c9
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
2017-06-24 04:47:36 +00: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 ad50361ece
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
3c3f1986cc
Merge "Handle invalid destination address gracefully" into oc-dr1-dev am: 93ea43386e
...
am: 95fbd2afef
2017-06-23 21:52:06 +00:00
Chen Xu
95fbd2afef
Merge "Handle invalid destination address gracefully" into oc-dr1-dev
...
am: 93ea43386e
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
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
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
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
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 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
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
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
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
2017-06-19 20:16:07 +00:00
Hall Liu
d974296f8c
Merge changes from topics 'embms-init-fix', 'embms-download-2'
...
am: e601160a96
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
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
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
