Jonathan Basseri
96bfbcdcd4
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am: 7728849a39
...
am: 0fed7e3282
2017-08-02 02:27:55 +00:00
Jonathan Basseri
7728849a39
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
...
am: 85a215bae7
2017-08-02 01:58:18 +00:00
Jonathan Basseri
89a2a41572
Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6
...
am: aaeca1e977
2017-08-02 01:51:21 +00:00
Jonathan Basseri
85a215bae7
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
2017-08-02 01:44:09 +00:00
Jonathan Basseri
379128e5c2
Revert "Move getNetworkCountryIso impl from TM to PIM."
...
This reverts commit 6f4657363c
2017-08-02 01:10:47 +00:00
Jonathan Basseri
02cc8151a6
Merge "Move getNetworkCountryIso impl from TM to PIM."
...
am: 58bbef15d8
2017-08-01 22:34:44 +00:00
Jonathan Basseri
58bbef15d8
Merge "Move getNetworkCountryIso impl from TM to PIM."
2017-08-01 22:25:28 +00:00
Jonathan Basseri
6f4657363c
Move getNetworkCountryIso impl from TM to PIM.
...
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug: 63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
2017-08-01 22:24:05 +00:00
Hall Liu
76716535d9
Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2 am: 8c4179e88c
...
am: 7a83a8ac77
2017-07-28 02:57:24 +00:00
Hall Liu
8c4179e88c
Merge "Un-hide the MBMS streaming APIs"
...
am: a50e17aea2
2017-07-28 02:40:20 +00:00
Hall Liu
2398921320
Un-hide the MBMS streaming APIs
...
Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.
Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7
2017-07-27 15:38:36 -07:00
Hall Liu
a3011a0401
Merge "Make slight API and doc adjustments" am: b7e10650d8 am: 14be4e65b2
...
am: 0f18557df8
2017-07-21 21:29:24 +00:00
Hall Liu
14be4e65b2
Merge "Make slight API and doc adjustments"
...
am: b7e10650d8
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
Amit Mahajan
f4292bacf9
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
...
am: 37a9991be9
2017-07-20 20:58:39 +00:00
Amit Mahajan
37a9991be9
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
2017-07-20 20:47:17 +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
7acfec846b
Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9
...
am: 12286b2608
2017-07-20 00:42:21 +00:00
Robert Greenwalt
5f047a68d9
Merge "Add details to Download progress callback"
...
am: b440b572d7
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
Chen Xu
47208e2cf5
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
...
am: 068397a319
2017-07-19 03:12:33 +00:00
Chen Xu
068397a319
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
2017-07-19 03:06:01 +00:00
fionaxu
7834be2a3c
initial value for data_roaming based on carrier
...
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.
Bug: 36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
2017-07-18 17:32:52 -07:00
Amit Mahajan
d497794934
Add new column user_editable to Carriers table in telephony db.
...
Test: Verified manually that an APN with user_editable=false cannot be
modified via UI
Bug: 62852457
Change-Id: I67f1c5c537978d54aeea0a726d4056593381aa2d
2017-07-18 16:58:52 +00:00
Naveen Kalla
7e15c58085
resolve merge conflicts of b78661052c to oc-dr1-dev-plus-aosp
...
Bug: 62933474
Test: Build
Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 20:49:08 -07:00
Hall Liu
7b8d8578de
Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe am: d98024a1f9
...
am: f83fb827a7
2017-07-14 02:54:29 +00:00
Hall Liu
d98024a1f9
Merge "Clean up streaming API docs and organize errors"
...
am: d2c8dcfcfe
2017-07-14 02:43:10 +00:00
Naveen Kalla
abd2842ce1
Convert CDMA caller ID codes while roaming on 3GPP networks
...
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.
Bug: 62933474
Test: Simulate Roaming scenario and ensure that the dial
string is converted as expected.
Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 15:08:51 -07: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
81d9c6fe71
Merge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222
...
am: 9888af1dfc
2017-07-12 23:44:51 +00:00
Hall Liu
d45a007222
Merge "Implement getDownloadStatus and add permission"
...
am: 2fa880d016
2017-07-12 23:27:49 +00:00
Derek Tan
0eba3cb020
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
...
am: f1328fee0d
2017-07-07 23:18:54 +00:00
Derek Tan
f1328fee0d
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
2017-07-07 23:12:44 +00:00
Amit Mahajan
d6c82cde94
Merge "Make dun APNs as read-only by default." into oc-dr1-dev
...
am: 730e4a5651
2017-07-07 02:37:34 +00:00
TreeHugger Robot
730e4a5651
Merge "Make dun APNs as read-only by default." into oc-dr1-dev
2017-07-06 23:50:32 +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
da7669040c
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
...
am: af3c9615f1
2017-07-06 18:47:57 +00:00
Hall Liu
5b754768a2
Merge "Add a reason arg to streamStateUpdated"
...
am: 6ba3829074
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
64ec5d3547
Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a
...
am: 812d0866b1
2017-07-06 02:16:11 +00:00
Hall Liu
5e7c98bb6a
Merge "Update DownloadRequest API"
...
am: fa42eea98f
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
949b625c57
Merge "Implement cancelDownload and remove appName" am: 9b43ffcf2f am: 4b1acf4421
...
am: 4c751c865a
2017-06-29 21:58:22 +00:00
Hall Liu
4b1acf4421
Merge "Implement cancelDownload and remove appName"
...
am: 9b43ffcf2f
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
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
