Ying Xu
ed38bfdc8f
Merge "Use Bundle for inter-process message" into oc-dr1-dev am: e5ad3821e3
...
am: c567b16604
2017-06-28 16:59:26 +00:00
Ying Xu
c567b16604
Merge "Use Bundle for inter-process message" into oc-dr1-dev
...
am: e5ad3821e3
2017-06-28 16:54:19 +00:00
Ying Xu
e5ad3821e3
Merge "Use Bundle for inter-process message" into oc-dr1-dev
2017-06-28 16:47:50 +00:00
pkanwar
db07b66d3a
Radio Interface changes to pass the encryption object, including the
...
key,to the modem.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual
(cherry picked from commit 6d50fec388
2017-06-28 00:31:58 +00:00
yinxu
5604943709
Use Bundle for inter-process message
...
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.
Test: Telephony sanity tests
Bug: 30954762
Change-Id: I77945b247530b85c0b82876d528549498a711550
2017-06-27 14:52:45 -07:00
Jeff Sharkey
55b390b399
Merge "Only require that system UIDs tag their sockets."
2017-06-27 19:11:03 +00:00
Brad Ebinger
69754b07ba
Merge "Merge "IMS: Check for binderstate before calling endSession" am: c49534cf09 am: 1de1c2bb66 am: 8f2950b2c4" into oc-dr1-dev-plus-aosp
...
am: d0b5ca2e26
2017-06-27 19:03:11 +00:00
Jeff Sharkey
5ab0243330
Only require that system UIDs tag their sockets.
...
Apps with a normal UID are typically isolated enough to not require
socket tagging; we're mostly interested in tracking down internal
UIDs that have lots of code sharing the same UID.
Also fix up everyone doing manual string checks of Build.TYPE, since
we now have first-class fields for those.
Bug: 38126076
Test: builds, boots
Change-Id: I3a40348196bd8459289f2b9355d9783a07f1e7dd
2017-06-27 11:11:06 -06:00
Brad Ebinger
913e11fcdf
Merge "IMS: Check for binderstate before calling endSession" am: c49534cf09 am: 1de1c2bb66
...
am: 8f2950b2c4
2017-06-27 17:08:55 +00:00
Brad Ebinger
1de1c2bb66
Merge "IMS: Check for binderstate before calling endSession"
...
am: c49534cf09
2017-06-27 16:57:11 +00:00
Brad Ebinger
c49534cf09
Merge "IMS: Check for binderstate before calling endSession"
2017-06-27 16:46:59 +00:00
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
Benergy Meenan Ravuri
bed4d19db5
IMS: Check for binderstate before calling endSession
...
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug: 62816014
Change-Id: I1bb588ce2be9c181355ff744f43dad4e784e4ec5
2017-06-26 23:29:22 +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
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
fionaxu
35276a6696
resolve merge conflicts of 187fe9d5cf to oc-dr1-dev-plus-aosp
...
Change-Id: I2cbfdd9b0fcf024509dbda84678ef067add014f9
2017-06-22 12:20:52 -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
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
Tyler Gunn
42e7611980
Merge "Add Telephony connection event for call forwarded supp service notice." into oc-dr1-dev am: 7772487d98
...
am: 5f661f9484
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
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
Jeff Davidson
efd7a8c0c0
Merge "eUICC API error code cleanup." into oc-dr1-dev am: 93a59696ad
...
am: 7074cb84f0
2017-06-15 03:49:31 +00:00
Jeff Davidson
7074cb84f0
Merge "eUICC API error code cleanup." into oc-dr1-dev
...
am: 93a59696ad
2017-06-15 03:42:02 +00:00
Ying Xu
69a598b96c
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1 am: aaca44229b
...
am: 830b8ecab2
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
2017-06-14 02:41:26 +00:00
Ying Xu
aaca44229b
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928
...
am: 707dc81da1
2017-06-14 02:33:41 +00:00
Ying Xu
707dc81da1
Merge "Adds error codes and maximum RAN/Bands/Channels"
...
am: 70373f7928
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
