Commit Graph

2082 Commits

Author SHA1 Message Date
Hall Liu
14be4e65b2 Merge "Make slight API and doc adjustments"
am: b7e10650d8

Change-Id: I96a361924ddff300eb36933bed67d30ec00e8f87
2017-07-21 21:18:42 +00:00
Hall Liu
b7e10650d8 Merge "Make slight API and doc adjustments" 2017-07-21 21:09:34 +00:00
Hall Liu
64a98f9646 Make slight API and doc adjustments
* Fix a compile error on Java 7
* Update initialization mechanism to allow exceptions and return codes
* App-facing api for StreamingService#dispose no longer throws an
IllegalArgumentException
* Add REASON_NONE to stream state change reasons

Change-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7
2017-07-20 13:31:52 -07:00
Robert Greenwalt
5f047a68d9 Merge "Add details to Download progress callback"
am: b440b572d7

Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011
2017-07-20 00:30:50 +00:00
Robert Greenwalt
0ebff46583 Add details to Download progress callback
Split decode into max size and current size.

Test: builds
Change-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7
2017-07-19 15:02:29 -07:00
Hall Liu
d98024a1f9 Merge "Clean up streaming API docs and organize errors"
am: d2c8dcfcfe

Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab
2017-07-14 02:43:10 +00:00
Hall Liu
46cbcd1b4a Clean up streaming API docs and organize errors
* Implement listPendingDownloads and resetDownloadKnowledge
* Bring MbmsStreamingManager docs in line with vendor-side API docs.
* Remove activeStreamingServicesUpdated
* Reorganize the errors in MbmsException into categories.
* Add some vendor API docs for file-download

Change-Id: Ia29066ea6f2c0414171cffa1ae11bb467f187bee
2017-07-12 16:53:12 -07:00
Hall Liu
d45a007222 Merge "Implement getDownloadStatus and add permission"
am: 2fa880d016

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959
2017-07-12 23:27:49 +00:00
Hall Liu
55f557dc7c Implement getDownloadStatus and add permission
- Implement getDownloadStatus in the manager
- Remove DownloadStatus and add constants in its place to reflect the
status of a single file
- Add ACT_AS_EMBMS_MIDDLEWARE permission

Change-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87
2017-07-06 13:40:09 -07:00
Hall Liu
5b754768a2 Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af
2017-07-06 18:24:02 +00:00
Hall Liu
6ba3829074 Merge "Add a reason arg to streamStateUpdated" 2017-07-06 18:08:02 +00:00
Hall Liu
5e7c98bb6a Merge "Update DownloadRequest API"
am: fa42eea98f

Change-Id: I0b966f0fa2ca3e1c45bf4932654a3bbc1b2d05eb
2017-07-06 02:03:42 +00:00
Hall Liu
fa42eea98f Merge "Update DownloadRequest API" 2017-07-06 01:52:04 +00:00
Hall Liu
6e1d2feef5 Add a reason arg to streamStateUpdated
Change-Id: I6cc48b64aa885672e062b060a0cf58649df17916
2017-06-30 14:41:18 -07:00
Hall Liu
4b1acf4421 Merge "Implement cancelDownload and remove appName"
am: 9b43ffcf2f

Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735
2017-06-29 21:45:47 +00:00
Hall Liu
9b43ffcf2f Merge "Implement cancelDownload and remove appName" 2017-06-29 21:33:11 +00:00
Hall Liu
3bedd88cae Update DownloadRequest API
- Add set/getOpaqueData methods so middleware has one thing to persist
- remove id from DownloadRequest since nobody seems to want it
- replace FileServiceInfo with a service ID
- add a FileInfo extra when sending file-completion to the app

Change-Id: I75be3cce923d5d3c74081d344074b4e3c67deff3
2017-06-29 14:31:00 -07:00
yinxu
5311da134a Merge "Use Bundle for inter-process message"
am: db8e4efd5b

Change-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771
2017-06-29 02:05:53 +00:00
Treehugger Robot
db8e4efd5b Merge "Use Bundle for inter-process message" 2017-06-29 01:51:04 +00:00
Hall Liu
9f116ef480 Implement cancelDownload and remove appName
Implements the cancelDownload call
Removes appName as an argument from all EMBMS-related apis
Implements the cross-filesystem move method in MbmsDownloadReceiver

Change-Id: Ie8ebfccca4fbb3d69289beb2ed77101fe2c7727f
2017-06-28 15:00:56 -07:00
Hall Liu
761bad1c53 Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am: c2f33f18eb

Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
2017-06-28 20:36:49 +00:00
Hall Liu
8763c625a3 Add download request tokens and enforce destination clear
am: 2043f70acb

Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
2017-06-28 20:35:54 +00:00
Hall Liu
c2f33f18eb Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
  Implement the cleanup action in MbmsDownloadReceiver
  Add download request tokens and enforce destination clear
2017-06-28 20:26:15 +00:00
yinxu
77e6f9909a 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.

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

Test: Telephony sanity tests
Bug: 30954762

Merged-in: I77945b247530b85c0b82876d528549498a711550
Changg-Id: I77945b247530b85c0b82876d528549498a711550
(cherry picked from commit 5604943709)

Change-Id: Iec4043e611a8f58733a361ec9a52fc74e1c974d5
2017-06-28 10:58:31 -07:00
Hall Liu
990a573da9 Implement the cleanup action in MbmsDownloadReceiver
Implement ACTION_CLEANUP, add result codes for the ordered broadcasts,
and remove the download request extra for file descriptor requests

Change-Id: I5ee19ad0aefbdceacb636b3d17e197a6fb1bdaa6
2017-06-27 19:15:55 -07:00
Brad Ebinger
1de1c2bb66 Merge "IMS: Check for binderstate before calling endSession"
am: c49534cf09

Change-Id: I9d173693c466b7d8512d11f266af48f5307669d5
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
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
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
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
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
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
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
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
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
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
pkanwar
5aa279287c 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
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
2017-06-13 08:35:32 -07:00
Pankaj Kanwar
3f095ca368 Merge "Address IMSI privacy issues." am: ef6b81e5b2
am: 91a4d3df01

Change-Id: I15e60cbbff06d7f66e86d755ae87b2e3513ca4a9
2017-06-13 00:45:04 +00:00