Commit Graph

17725 Commits

Author SHA1 Message Date
Hall Liu
f1167ced38 Merge "Add @TestApi for EMBMS APIs needed for CTS" 2017-11-01 22:35:51 +00:00
Tobias Thierer
ae71c4f23c make update-api
This CL almost exactly reverts http://r.android.com/471377 .

current.txt and friends were not reflecting the latest AOSP API,
ie. "make update-api" was not a no-op like it's supposed to be.

Apart from IpSecManager.SecurityParameterIndex.finalize(), this
seems to mostly revert http://r.android.com/471377 which suggests
that the tooling change that necessitated that CL was probably
reverted without "make update-api" being run on AOSP.

No further investigation was made for what CL(s) caused this or
whether any of this API change is undesired.

Test: Treehugger
Test: make update-api

Change-Id: I5b846627e38c47abb534def97f0cab9d28b1288c
2017-11-01 17:21:59 +00:00
Hall Liu
156b3041a9 Add @TestApi for EMBMS APIs needed for CTS
Bug: 68049452
Test: CTS
Change-Id: I5d132ac4e67deccf41c998822f82cf94d3f2ce7f
2017-10-31 18:49:09 -07:00
Hall Liu
1fab41e771 Merge "EMBMS - Add TestApi and provide service override" 2017-10-27 23:19:29 +00:00
Cassie Han
1565803cd2 Merge "Add the operator name and MCC/MNC in string format into the CellIdentity." 2017-10-27 17:17:54 +00:00
Hall Liu
64e22af32e EMBMS - Add TestApi and provide service override
Add @TestApi annotations to methods that CTS needs
Add a manifest meta-data key that allows client apps to specify the
exact component name of the MBMS service to bind to.

Bug: 68049452
Test: CTS
Change-Id: I50654c41da38696a25fad93d0a5e0b0c11fa0b42
2017-10-26 15:46:42 -07:00
Cassie
933b78d977 Add the operator name and MCC/MNC in string format into the CellIdentity.
Bug: 63984327
Test: Basic telephony sanity
Change-Id: Ia5e7f5b980efbde647f95f3e83a62d56132b90da
2017-10-25 10:04:31 -07:00
Benedict Wong
d3a5792024 Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am: b6df7f0d35

Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b
2017-10-19 17:14:53 +00:00
Benedict Wong
0febe5ece5 Add support for AES-GCM-ESP as an IPSec algorithm
Allows native AES-GCM-ESP to be used as an IPSec transport/tunnel mode
algorithm with kernel support

Bug: 63589918
Test: IPsecService tests added, existing ones pass
Change-Id: Ie1a9a902be205f269aa37bf956198f2e5b177c21
2017-10-18 11:22:24 -07:00
Brad Ebinger
946ff79971 Merge "Add new Download Error Codes"
am: e9bd5449b5

Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
2017-10-11 22:24:58 +00:00
Brad Ebinger
e9bd5449b5 Merge "Add new Download Error Codes" 2017-10-11 22:12:26 +00:00
Brad Ebinger
6fb5072fa8 Add new Download Error Codes
Adds new MBMS Download Session error codes to allow for
more fine grained error reporting to the client app.

Test: Manual
Change-Id: I9c2163d934835efaaa145e4c0f8a91838d84aa1e
2017-10-10 12:50:49 -07:00
Brad Ebinger
3b6df532f3 Merge "Require DownloadRequest#Builder to have mandatory Source URI"
am: 432c2b0fb9

Change-Id: I3332d44105c6ce4f8d4223caad66715c4c67d52f
2017-10-10 18:39:56 +00:00
Brad Ebinger
432c2b0fb9 Merge "Require DownloadRequest#Builder to have mandatory Source URI" 2017-10-10 18:27:36 +00:00
Brad Ebinger
ea737a8e1e Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.

Test: Manual, Telephony Test MBMS app
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
2017-10-10 00:06:04 +00:00
Brad Ebinger
387b90aa97 Merge "Adds a filtering bitmask to DownloadStateCallback"
am: 177bd65211

Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e
2017-10-03 20:55:50 +00:00
Brad Ebinger
177bd65211 Merge "Adds a filtering bitmask to DownloadStateCallback" 2017-10-03 20:23:00 +00:00
Brad Ebinger
768b6c5e4a Merge "Decouple Content Name Locale from Content Language Locale"
am: a830e83028

Change-Id: I225e8b71f53d584e1c8a6325dc2bb57421617dc4
2017-10-03 18:45:43 +00:00
Brad Ebinger
a830e83028 Merge "Decouple Content Name Locale from Content Language Locale" 2017-10-03 18:31:49 +00:00
Brad Ebinger
c74ae34ddb 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
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
2017-10-03 09:48:51 -07:00
Orion Hodson
7e806c2942 Merge "Update dalvik.bytecode package"
am: 537d63fe1a

Change-Id: I41ed71812f67136cbf456bfbdbc5b3a245c93f18
2017-10-03 08:06:57 +00:00
Brad Ebinger
d01f6eec20 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
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7
2017-09-29 15:34:50 -07:00
Orion Hodson
466f92d97b Update dalvik.bytecode package
BUG: 66562179
Test: m checkapi
Change-Id: Ifeecbecbd7334b55126b6e0f51eb5e8b516e341a
2017-09-27 13:55:38 +01:00
nharold
8d306cd78a Merge changes from topic "re-enable-ipsec"
am: 680525c742

Change-Id: Ia1d1f3981a9dd1eb8f60631d318211daf135d575
2017-09-26 22:13:20 +00:00
nharold
680525c742 Merge changes from topic "re-enable-ipsec"
* changes:
  Re-Expose IpSecService API Surface
  Re-Enable Starting of the IpSecService
2017-09-26 21:46:39 +00:00
Charles He
692b55390f Merge changes from topic "always-on-vpn"
am: cc15c7f8c1

Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
2017-09-19 08:01:45 +00:00
Charles He
cc15c7f8c1 Merge changes from topic "always-on-vpn"
* changes:
  Opt-out for always-on VPN: rename API.
  Opt-out for always-on VPN
2017-09-19 07:50:13 +00:00
Pengquan Meng
74bd3daaac Merge "Incorrect decoding when TP-OA contains non-integer information"
am: 2bcc7fac89

Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
2017-09-19 01:23:53 +00:00
Erika Avenberg
0be6d7cbd8 Incorrect decoding when TP-OA contains non-integer information
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.

This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0

Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
 information in the semi-octets other than "1111" (e.g. 1110)
 it shall display the semi-octet as the representation given
 in GSM 44.008 [12] under "called BCD number", viz 1010="*",
 1011="#", 1100="a", 1101="b", 1110="c"."

Bug: 65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
2017-09-18 15:21:08 -07:00
Hall Liu
4c4fb3bdfb Merge "API council suggested edits, part 3"
am: 7a4cc05d45

Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450
2017-09-15 00:45:05 +00:00
Hall Liu
3934c475ce Merge "Apply suggested edits to the file-download API"
am: f6c9baa0cd

Change-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c
2017-09-15 00:40:49 +00:00
Hall Liu
e373ee5d5c 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 14:51:32 -07:00
Hall Liu
23d80af5c1 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 14:37:47 -07:00
Hall Liu
200d8f6242 Merge "Make changes to MBMS Streaming APIs per recommendations"
am: 1bbf287859

Change-Id: I76662fd9822dcde781cdecafb45239e1da6337d9
2017-09-14 19:45:04 +00:00
Hall Liu
1bbf287859 Merge "Make changes to MBMS Streaming APIs per recommendations" 2017-09-14 19:34:11 +00:00
Hall Liu
e9b31e8eaf Merge "Unhide EMBMS download API"
am: 0285ee851d

Change-Id: Ib94f80270615f3d4a710c31b6ab81b40d77333ad
2017-09-13 22:22:04 +00:00
Hall Liu
0285ee851d Merge "Unhide EMBMS download API" 2017-09-13 20:40:34 +00:00
Nathan Harold
d999d225a8 Re-Expose IpSecService API Surface
Note, This reverts commit bd62d6aff2.

Bug: 64800246
Test: compilation
Change-Id: I709d4c476647cfe9f6b982fc373f8d76018b3922
2017-09-12 19:25:13 -07:00
nharold
447b7c49fc Merge "Un-hide TelephonyManager.getSignalStrength()"
am: 3e884ce13c

Change-Id: I0692185c533ca4a0999cbf3237c3afabd4b87972
2017-09-11 18:07:07 +00:00
nharold
3e884ce13c Merge "Un-hide TelephonyManager.getSignalStrength()" 2017-09-11 17:44:34 +00:00
Sanket Padawe
f0dd39f7d0 Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."
am: a90205492f

Change-Id: I1d15e13cb3ae8fa8caf098e34587e3599b5bc967
2017-09-11 03:40:47 +00:00
Hall Liu
d666a89163 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
Change-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d
2017-09-08 14:55:03 -07:00
Hall Liu
39605add89 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-08 14:52:21 -07:00
Sanket Padawe
5aac2e91db Deprecate TelephonyManager APIs which are present in TelecomManager.
Bug: 62346128
Test: Build
Change-Id: I4c3b4652f5d22215572d64b764bcd42bb7295ebe
Merged-in: I4c3b4652f5d22215572d64b764bcd42bb7295ebe
2017-09-08 05:46:13 -07:00
Charles He
5da5ae3b96 Opt-out for always-on VPN: rename API.
Rename the opt-out flag in AndroidManifest to
SERVICE_META_DATA_SUPPORTS_ALWAYS_ON
as directed by the API Council.

Bug: 64331776
Bug: 36650087
Test: runtest --path java/com/android/server/connectivity/VpnTest.java
Change-Id: I24326fad7a89083a2409134640bda81ee0359d08
Merged-In: I24326fad7a89083a2409134640bda81ee0359d08
(cherry picked from commit c57a01c166)
2017-09-08 10:47:34 +01:00
Charles He
a0a87e8108 Opt-out for always-on VPN
Always-on VPN is a feature introduced in N. Since then, all VPN apps
targeting N+ are assumed to support the feature, and the user or the DPC
can turn on / off always-on for any such VPN app. However, a few VPN
apps are not designed to support the always-on feature. Enabling
always-on for these apps will result in undefined behavior and confusing
"Always-on VPN disconnected" notification.

This feature provides a new manifest meta-data field through which a VPN
app can opt out of the always-on feature explicitly. This will stop the
always-on feature from being enabled for the app, both by the user and
by the DPC, and will clear its existing always-on state.

A @hide API is provided to check whether an app supports always-on VPN.
Documentation is updated to reflect the behavior change.

Bug: 36650087
Test: runtest --path java/com/android/server/connectivity/VpnTest.java
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage'
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced'

Change-Id: I477897a29175e3994d4ecf8ec546e26043c90f13
Merged-In: I477897a29175e3994d4ecf8ec546e26043c90f13
(cherry picked from commit 3673863f3b)
2017-09-08 10:18:36 +01:00
Nathan Harold
2b86092afe Un-hide TelephonyManager.getSignalStrength()
Expose the API to directly retrieve the latest cached
signal strength from ServiceStateTracker.

Bug: 36133439
Test: manual/sl4a
Change-Id: I36e4a24f19d49da5797d875ccfd10576ca0a68b8
2017-08-29 14:13:33 -07:00
Joachim Sauer
0fc0cc9dd8 Merge "Adapt ICU 59 API update to Doclava changes."
am: e048261656

Change-Id: Iea671a7029e083bffee2bcaacfaa0df41f45c1cc
2017-08-29 13:54:14 +00:00
Joachim Sauer
e447d9f0fb Adapt ICU 59 API update to Doclava changes.
Add methods that were missing from the previous API update because the
update-api version used for that had different behaviour from the
current one.

Specifically overrides for methods that differ only in sychronization
are now considered API-worthy and weren't before (b/62576297).

All methods added in this commit are methods that exist in the base
class without synchronization and are synchronized in the class they are
now being added in.

Bug: 64807220
Test: m checkapi
Change-Id: I9bf1b3d02e6a8f04b93ec36c0adffb7eedad3ad3
Merged-In: Iff584fb72dc8d651f9482b573f4b8cec89840ca6
2017-08-29 11:26:29 +01:00
Shuo Qian
782395561d Merge "Add new error code in SmsManager"
am: 387ed22fef

Change-Id: Iff96995b90ecd6ae7fcceebf6b2017344038be72
2017-08-25 18:15:12 +00:00