Commit Graph

4784 Commits

Author SHA1 Message Date
Brad Ebinger
dbe2815199 Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev 2017-10-04 21:42:33 +00:00
Brad Ebinger
bd8d517381 Merge "Remove verification for DownloadReceiver when failure" into oc-mr1-dev 2017-10-04 19:55:34 +00:00
Brad Ebinger
dec9fda324 Adds a filtering bitmask to DownloadStateCallback
Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.

Test: Testapps
Bug: 67112896
Merged-In: Iab96a457f45f759267b9a5a41df533c9988ede94
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
2017-10-04 17:41:28 +00:00
Brad Ebinger
e4294cd19e Remove verification for DownloadReceiver when failure
When the ACTION_DOWNLOAD_RESULT_INTERNAL intent is received
with a failure result, don't require that extras exist
in the receiver.

Test: Manual, Testapps
Bug: 67112896
Merged-In: I9ce32afc0c6e99b0a61e05a2d2b65855f054abd9
Change-Id: I9ac43a33aff88755cbc804890ce230743195f44d
2017-10-03 20:35:25 +00:00
Brad Ebinger
a722139f9c Decouple Content Name Locale from Content Language Locale
There was an assumption that content language Locale was
a 1:1 mapping with content locale name, which is not the
case. This change separates the two and provides a new
API for retreiving the set of Locales for content name.

Test: Manual
Bug: 67112896
Merged-In: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7
2017-10-03 20:33:15 +00:00
Jack Yu
66420e258a Fixed that telephony registry service reference incorrectly assigned
The reference to telephony registry service was assigned
prior telephony registry service was ready. Fixed by
casting the binder every time when we use it.

Test: Manual
Bug: 65593241
Change-Id: Ib234cdfd93130f7af44ef79271b106fffb8ebad5
2017-09-22 10:04:51 -07:00
Hall Liu
bfc5f1c9a8 API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.

Bug: 30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
2017-09-14 17:14:24 -07:00
Hall Liu
1a5b130468 Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale

Bug: 30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
2017-09-14 17:04:49 -07:00
Hall Liu
a96478a9b7 Make changes to MBMS Streaming APIs per recommendations
* Rename MbmsStreamingManager -> MbmsStreamingSession
* MbmsStreamingSession now implements AutoClosable instead of using
dispose()
* No longer throw checked MbmsExceptions from any methods. All such
errors will be reported via the async callback.
* null arguments no longer accepted for Handlers
* Guarantee that no further callbacks will get enqueued after closing.

Test: run testapps
Bug: 30981736
Merged-In: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
Change-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d
2017-09-14 13:42:08 -07:00
Hall Liu
242de1bcda Unhide EMBMS download API
Make changes to the download API so that it passes the linter, remove
@hide tags.

Test: manual
Bug: 30981736
Change-Id: Ifa0d36896338b0108fbaad4b1e9b8d857a43d491
2017-09-13 14:02:44 -07:00
Hall Liu
9903558d9d Make EMBMS adjustments for 08/04
* Add a download state callback to the callback formerly for progress
* Rename EXTRA_SERVICE_INFO to EXTRA_SERVICE_ID, and specify that it
should be a String rather than a ServiceInfo
* Add documentation to clarify that the progress/state callback may be
null

Bug: 30981736
Test: manual
Change-Id: Ie1ec99868f5b09a270b500dc97abeb9f819cfa56
2017-09-13 13:19:18 -07:00
Hall Liu
3b51e07889 Prepare EMBMS apis for un-hiding
Add more documentation to places that were lacking, bring more things in
line with the API guidelines

Change-Id: I809af5534ab425ee7e1e2dc8695d5b7e649dd22d
Test: testapps
Bug: 30981736
2017-09-13 13:18:59 -07:00
Hall Liu
aee278d6d8 Merge changes from topics "embms-0728-adjustments", "embms-0721-adjustments", "fix-streaming-api", "mock-unhide-embms-streaming" into oc-mr1-dev
* changes:
  Embms adjustments for 7/28
  Embms API adjustments for 7/21
  Fix lint errors in the streaming API
  Mock-un-hide the MBMS streaming APIs
2017-09-08 21:39:29 +00:00
Tyler Gunn
e3cf5cda13 Merge "Ensure *# are included in TTS spans generated with PhoneNumberUtils." into oc-mr1-dev 2017-09-07 15:14:44 +00:00
fionaxu
b537d740c1 disable carrier actions on redirection part 2
DO NOT MERGE handle the corner case: user on new pixel device update from O-DR to
O-MR when they are in captive portal scenario. In this scenrio,
we enabled captiveportalLoginActivity has the default url handler. this
will be persist and reset on sim absent/sim load/network avail.
On my previous fix, I removed all the signals which means after OTA
we won't reset this part. We should leave the reset signal to ensure
no carrier actions applied. even if something abnormal happens, we can
recover gracefully from reboot.

Bug: 65113738
Test: Manual
Change-Id: I445c7bce01e0bf36214f5f4f6327a0582c774dae
2017-09-06 14:55:35 -07:00
TreeHugger Robot
5bed401148 Merge "disable carrier actions on redirection by default" into oc-mr1-dev 2017-09-06 04:01:43 +00:00
Xiangyu/Malcolm Chen
aa4c059da1 Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev 2017-09-06 01:09:35 +00:00
Tyler Gunn
c78a615dc0 Ensure *# are included in TTS spans generated with PhoneNumberUtils.
PhoneNumber utils has a method, createTtsSpan, which creates a span
for talkback to speak a phone number.  Due to a bug in Talkback it used
to strip out * and # characters.

Removing this limitation as the bug in talkback has been fixed.

Test: Manual, added unit tests
Bug: 63613215
Change-Id: I983a98a18830e32760602723e695f11e3eab9ffe
2017-09-05 14:28:47 -07:00
fionaxu
204777011d disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.

Bug: 65113738
Test: Manual
Change-Id: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
2017-09-05 14:15:04 -07:00
Hall Liu
25bdb2c8cc Embms adjustments for 7/28
* Move some vendor intents and extras into a VendorIntents class
* Add a download result RESULT_IO_ERROR
* Add documentation noting that repeated calls to
setTempFileRootDirectory will not throw an error if the parameter is the
same.
* Add getTempFileRootDirectory method for app
* Hide AIDL classes from the public/system API surfaces for download
* Remove size and md5hash from FileInfo

Test: testapps
Bug: 30981736
Change-Id: I8c968a7d68db2588ee550167ed2693fe89c5925a
2017-08-31 11:10:07 -07:00
Tyler Gunn
e0f1f26d87 Merge "De-couple data enabled from VT settings." into oc-mr1-dev 2017-08-31 15:13:08 +00:00
Hall Liu
1407bdd635 Merge "Make slight API and doc adjustments" into oc-mr1-dev 2017-08-30 20:41:53 +00:00
Brad Ebinger
ed6e29f292 Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev 2017-08-30 18:31:43 +00:00
Tyler Gunn
0240dc99db Merge "Handle alternate status values." into oc-mr1-dev 2017-08-29 21:06:20 +00:00
Malcolm Chen
b0d99e435b Add EVENT_ROAMING_SETTING_CHANGE in DctConstants.
Bug: 64746542
Test: Manual
Change-Id: I91a0cb078e40b5491085a39de7c551065c00da30
2017-08-29 20:56:58 +00:00
Hall Liu
0bd7a6058c Embms API adjustments for 7/21
* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.

Bug: 30981736
Test: testapps
Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e
2017-08-29 13:49:13 -07:00
Hall Liu
4f306dedc5 Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.

Bug: 30981736
Test: manual, with testapps
Change-Id: If4a9a5533a235a8cc56762ab7a9e32ec89440f1d
2017-08-29 11:10:14 -07:00
Brad Ebinger
27ca268756 Adds ERROR state to ImsConfig
Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.

Bug: 64540800
Test: Manual
Change-Id: I0b79837c694d245999031ec65783857e114b7c75
2017-08-29 16:29:18 +00:00
Hall Liu
1169bc596c Mock-un-hide the MBMS streaming APIs
In AOSP, this unhid the MBMS streaming APIs and modified the
vendor base classes to no longer pass raw AIDLs to the vendor code.

@hide tags put back in for MR1.

Bug: 30981736
Test: builds
Change-Id: I861e0568e3bf9ee9a937bf6314b1fc839a31f00c
Merged-In: I8dd83d01a7511968ed51a80ad358a48e50c3d1e7
2017-08-28 18:19:18 -07:00
Hall Liu
1e211675ca 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

Bug: 30981736
Change-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7
2017-08-28 18:17:58 -07:00
Tyler Gunn
b229ddabda Handle alternate status values.
Some carriers use sendrecv to indicate a call in a conference is active,
and sendonly to indicate that the remote party has held the call.
Adding support for these status values.

This ensures that remotely held calls for these carriers are set to held.

Test: Manual
Bug: 33272103
Change-Id: I4a950c4e143d5ac396b30569dbda0b1cf4e92a3e
2017-08-28 17:44:55 +00:00
Shuo Qian
1dafcc89a5 Merge "Add new error code in SmsManager" into oc-mr1-dev 2017-08-24 21:22:31 +00:00
Tyler Gunn
9a961f5705 De-couple data enabled from VT settings.
The existing KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS has the impact
of decoupling whether VT is enabled from whether mobile data is enabled.
Making this TRUE by default.
Adding a new carrier config option to indicate whether VILTE data is metered.
This, coupled with KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS allows
us to ensure that wifi video calls can be made, while still ensuring that
mobile data is not used for VT calls.
A carrier config update needs to be made for the few instances where
KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS was set true to ensure
that KEY_VILTE_DATA_IS_METERED_BOOL is false in that case.

Test: Manual
Bug: 36900451
Change-Id: I037f8930901907b55e4245a655e0480668549185
2017-08-23 11:29:20 -07:00
sqian
724f621daa Add new error code in SmsManager
Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: I0b227e76048dd46d9c8023d37647db763e1e38e1
2017-08-22 14:51:03 -07:00
Tyler Gunn
c6c78ec18f Add new telephony disconnect causes for low battery scenario.
LOW_BATTERY is for disconnect mid-call due to low battery.
DIAL_LOW_BATTERY is for failure while dialing due to low battery.

Test: Manual.
Change-Id: Ife7a4ca5645b3fb42ab20effb4d8d4a8fef8116b
Fixes: 63936576
2017-08-22 11:13:05 -07:00
Lorenzo Colitti
21bc3a39a4 Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev 2017-08-19 00:54:59 +00:00
Pankaj Kanwar
94fa7ee972 Merge "Building IMSI encryption support." into oc-mr1-dev 2017-08-18 20:23:08 +00:00
pkanwar
becc8696a8 Building IMSI encryption support.
Added additional error checks while returning the key.
Create config parameter:
1. IMSI_KEY_AVAILABILITY_INT.
BUG: 35606429
Test: manual

Change-Id: Iaa5fed3b51719679051626081d82b85a04128896
2017-08-18 09:41:08 -07:00
Lorenzo Colitti
5356a35c3b Add tether offload traffic to interface stats as well.
Currently, we only count add tethering traffic to per-UID
stats, but not to total data usage (i.e., dev and XT stats). This
is correct for software tethering, because all software forwarded
packets are already included in interface counters, but it is
incorrect for hardware offload, because such packets do not
increment interface counters.

To fix this:
1. Add an argument to ITetheringStatsProvider#getTetherStats to
   indicate whether per-UID stats are requested. For clarity,
   define integer constants STATS_PER_IFACE and STATS_PER_UID
   to represent these operations.
2. Make NetdTetheringStatsProvider return stats only if per-UID
   stats are requested. (Otherwise tethering traffic would be
   double-counted).
3. Make OffloadController's stats provider return the same
   stats regardless of whether per-UID stats were requested or
   not.
4. Make NetworkStatsService add non-per-UID tethering stats to
   the dev and XT snapshots. The per-UID snapshots were already
   correctly adding in per-UID stats.

Bug: 29337859
Bug: 32163131
Test: runtest frameworks-net
Test: runtest frameworks-telephony
Change-Id: I7a4d04ab47694d754874136179f8edad71099638
2017-08-19 00:21:56 +09:00
Nathan Harold
2a9da68e39 Merge "Cleanup ServiceState.toString()" into oc-mr1-dev 2017-08-18 01:59:06 +00:00
TreeHugger Robot
b70a55a7b5 Merge "Reduced the retry after disconnect delay" into oc-mr1-dev 2017-08-17 18:04:40 +00:00
Jeff Davidson
0ac6e0e22c Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public.
There is a reasonable use case for carrier apps to turn off this key
(b/64544341) so it should be visible to apps in the SDK.

Change-Id: I1a06196d4d4c7d6d06026ef74f3f1159c973f8e3
Test: TreeHugger
Fixes: 64721199
2017-08-16 23:30:36 +00:00
Qingxi Li
d339e30c26 Merge "Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" into oc-mr1-dev 2017-08-16 23:03:48 +00:00
Jack Yu
5523dc55d8 Reduced the retry after disconnect delay
Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.

Test: Manual
bug: 63633916
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
2017-08-16 14:26:56 -07:00
pkanwar
68e3de7214 Show notification when VoWiFi is active, and user is out of service for
voice.

Bug: 62618428
Test: manual
Change-Id: Ic630991da3199584dd313a8bf3138b020ecebd5c
2017-08-15 20:57:08 +00:00
Nathan Harold
0f6f6e261d Cleanup ServiceState.toString()
Updating the formatting of the toString() method to
name the fields that it's printing, and to use one of
the more common formats for object dumping.

Bug: 64300932
Test: compilation, dumpsys
Merged-In: I56c4679d2a4a184f659870481e2ce0699fe38613
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
(cherry picked from commit 9acfe6f90a)
2017-08-14 18:54:17 -07:00
qingxi
cfffe7554f Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION
Add EXTRA_FORCE_PROVISION for intent
ACTION_PROVISION_EMBEDDED_SUBSCRIPTION which will be used by the carrier
app to indentify whether the user chooses to use eUICC to set up the
cellular network in SUW.

Bug: 63869524
Test: E2E
Change-Id: I4d77fcd1ea62b98a885f3e1b78cc96ceed233e1d
2017-08-14 17:39:57 -07:00
fionaxu
a40b8b7431 Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
2017-08-08 09:02:23 +00:00
TreeHugger Robot
93bf6200eb Merge "app link handling under restricted mobile data" into oc-dr1-dev 2017-08-08 08:57:16 +00:00
Jonathan Basseri
b901f055b5 Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am: 35a563ef62

Change-Id: Ib898af17ce2985a1e19759dd9296f3cea8077018
2017-08-07 16:24:31 +00:00