Commit Graph

4439 Commits

Author SHA1 Message Date
Hall Liu
b6a16546b5 Merge "Embms download setup" am: da5b77fa9b
am: a807ee8f1c

Change-Id: I6a78b3873814283d768c7e9a642b882bef8b11fc
2017-06-08 01:32:43 +00:00
Hall Liu
a807ee8f1c Merge "Embms download setup"
am: da5b77fa9b

Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6
2017-06-08 01:26:28 +00:00
Hall Liu
0842831e23 Embms download setup
Add MbmsDownloadReceiver and MbmsTempFileProvider to facilitate MBMS
download.
Fill in the download method in MbmsDownloadManager

Test: testapps
Change-Id: Ibb30f3b2b9d14b9df6b53c06916c21e3ca3a42c6
2017-06-07 13:58:18 -07:00
Jeff Sharkey
67cb5f5210 Merge "Give Doclava our manifest; more permission docs." into oc-dev
am: 65d4cbba37

Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
2017-06-06 15:28:26 +00:00
Jeff Sharkey
bfc4fcde9f Give Doclava our manifest; more permission docs.
We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.

Also document more @SystemApi permissions.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api
Bug: 62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
2017-06-05 17:38:19 -06:00
Jeff Sharkey
7a2e4a8486 Merge "Annotate @SystemApi with required permissions." into oc-dev
am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
2017-06-05 22:28:21 +00:00
Jeff Sharkey
d86b8fea43 Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.

Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug: 62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
2017-06-05 13:27:11 -06:00
Brad Ebinger
ab9ad6446a Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6 am: bbe9e26247
am: 99533575b2

Change-Id: Ie29e837b6f952249683440f09630a587795238fa
2017-06-02 22:33:39 +00:00
Brad Ebinger
bbe9e26247 Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
am: 75b7ef15f6

Change-Id: I7075ab7524d363ade4f42d7d3d33251243707e8a
2017-06-02 22:19:31 +00:00
Brad Ebinger
df0a75fa74 Adds ACCESS_CLASS_BLOCKED Disconnect cause
Adds the ACCESS_CLASS_BLOCKED Disconnect cause in order
to allow the dialer to take action when this happens
during a VT call.

Bug: 33821263
Test: Build
Change-Id: I9afdd90f0a8a562b626b730dbb1b03cf37776ebd
2017-06-02 13:20:35 -07:00
Robert Greenwalt
c593bd3cc7 Merge "Move appName inside Downloadrequest." am: 142a392b75 am: 196cb3dff6
am: 7c3314f19c

Change-Id: Iaa997634e7d9370fb634d9741ba4266db6cb9b2f
2017-06-01 17:20:49 +00:00
Robert Greenwalt
196cb3dff6 Merge "Move appName inside Downloadrequest."
am: 142a392b75

Change-Id: I6512d4bc2406f23571c1d4e6425353930fb9b847
2017-06-01 17:05:40 +00:00
Robert Greenwalt
142a392b75 Merge "Move appName inside Downloadrequest." 2017-06-01 16:52:34 +00:00
Tyler Gunn
58e8a224e3 Merge "Ensure null/empty phone number does not crash international number check." into oc-dev
am: 0f542b48fb

Change-Id: I6b534dbb9253ad66c850c8d55a8e4b0b619ac64e
2017-06-01 07:14:29 +00:00
Jack Yu
b67a128206 Merge "Added video calling data usage per-uid support" am: 36fdb346f2 am: 2f74c02826
am: ce10610a9c

Change-Id: I0a068e0eb7e833ad28611cf2be1a8bc18d99830a
2017-06-01 05:53:47 +00:00
Robert Greenwalt
4b88cf4502 Move appName inside Downloadrequest.
Simplifies vendor API.

Test: builds
Change-Id: I1e59e8014aa0fe1c0d46bca3347f428347fa0365
2017-05-31 16:13:36 -07:00
Jack Yu
2f74c02826 Merge "Added video calling data usage per-uid support"
am: 36fdb346f2

Change-Id: I3901efbfafcfab7e076b669f0313dce860e97072
2017-05-31 21:44:13 +00:00
Tyler Gunn
438559e183 Ensure null/empty phone number does not crash international number check.
Add empty/null check for isInternationalNumber.

Test: Added unit tests.
Bug: 62162029
Change-Id: I779a1f78cbbe11adeefeca7fc83cfc1cfa431c61
2017-05-31 14:35:39 -07:00
Jack Yu
a14e8bde2c Added video calling data usage per-uid support
Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.

Test: Manual
bug: 37671326

Merged-In: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
2017-05-31 12:37:24 -07:00
Hall Liu
b2a5eceb2f Merge "Add new error codes in MbmsException" am: 8e7057ccf3 am: 20d98578f2
am: aac7e3a182

Change-Id: Ie426c6334590f30656166b0a7851fe75fa3d4684
2017-05-27 01:31:58 +00:00
Hall Liu
20d98578f2 Merge "Add new error codes in MbmsException"
am: 8e7057ccf3

Change-Id: Ie8bf825d1fe7c40c94abd0245e69d597afb2f9bc
2017-05-27 01:18:33 +00:00
Hall Liu
8e7057ccf3 Merge "Add new error codes in MbmsException" 2017-05-27 01:08:31 +00:00
Hall Liu
80a8687a87 Add new error codes in MbmsException
Test: builds
Change-Id: I523961f588ef5ada97e06f5a910875c123f97989
2017-05-26 15:49:32 -07:00
Brad Ebinger
095f72cc4c Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840
am: 689edc736f

Change-Id: Ifd9fc089d7165506f6953e810c040de868f5bafe
2017-05-25 23:10:21 +00:00
Brad Ebinger
be34238840 Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
am: 25ce41cf4c

Change-Id: Ic24b93e215995a18e1a2ecbb647af0cc8e1f67cb
2017-05-25 22:51:11 +00:00
Brad Ebinger
25ce41cf4c Merge "Add IMEI_NOT_ACCEPTED error code for IMS" 2017-05-25 22:31:53 +00:00
Brad Ebinger
8187781e37 Merge "Support RRO for emergency number conversion map" am: 671680e504 am: 8498a6cffd
am: ddd73513e6

Change-Id: Id41d327b54fdf95c86a4f6e8d3727b79b98a2d5b
2017-05-24 20:39:46 +00:00
Brad Ebinger
8498a6cffd Merge "Support RRO for emergency number conversion map"
am: 671680e504

Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82
2017-05-24 20:27:48 +00:00
Brad Ebinger
671680e504 Merge "Support RRO for emergency number conversion map" 2017-05-24 20:19:32 +00:00
Jack Yu
d35fccce64 Merge "Added IWLAN metered APN support" am: 70fe11fc38 am: ab48527680
am: b8f3e388fc

Change-Id: Ia03104b1604bb34c6993171e848aa6193409726a
2017-05-23 03:39:49 +00:00
Jack Yu
ab48527680 Merge "Added IWLAN metered APN support"
am: 70fe11fc38

Change-Id: I12573353fca921d1454d6829302a379cd6b2cc8b
2017-05-23 01:10:29 +00:00
Jack Yu
89c04b52f5 Added IWLAN metered APN support
If the device is in IWLAN mode, when checking if the APN
type is metered, we read the settings from the IWLAN
metered APN list.

Test: Telephony unit tests
bug: 38304530

Merged-In: I46c9e1a15dd0dd40811d5a959d558fc78608b127
Change-Id: I46c9e1a15dd0dd40811d5a959d558fc78608b127
2017-05-22 16:52:24 -07:00
Hall Liu
3ae2ef069e Merge "Implement stopStreaming API for MBMS" am: e245bf9067 am: a7fffdc0d9
am: efa377cbb6

Change-Id: I1a845cfdeef7bd53beb4fa9b49eebe7a06386622
2017-05-19 22:53:42 +00:00
Hall Liu
a7fffdc0d9 Merge "Implement stopStreaming API for MBMS"
am: e245bf9067

Change-Id: I4b70f26a5579ddf3af7d426a04aea8ba33312790
2017-05-19 22:40:22 +00:00
Hall Liu
e245bf9067 Merge "Implement stopStreaming API for MBMS" 2017-05-19 22:32:04 +00:00
Hall Liu
edbd456c04 Implement stopStreaming API for MBMS
Test: testapps
Change-Id: Ic0477bf489a89a67697a318ff0fab065e0327e08
2017-05-18 17:41:05 -07:00
Przemyslaw Szczepaniak
3a9f256329 resolve merge conflicts of 2ce1b38e85 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia1eb0590edf2b074f6cbf16060cda2257091edd8
2017-05-18 10:57:09 +01:00
Przemyslaw Szczepaniak
ab0f6fc5d2 Merge "Consolidated all data allow/disallow logic into one method"
am: 449d73251f

Change-Id: I861d75dad60ab83039aa06565141a2eb5b294386
2017-05-18 09:07:24 +00:00
Jack Yu
bd7d89c133 Consolidated all data allow/disallow logic into one method
Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.

Test: Telephony sanity tests and unit tests
bug: 33847610
Merged-In: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
Change-Id: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
2017-05-17 21:16:39 -07:00
yinxu
5a798bc18a Add the new RIL requests and NetworkScanResult.
Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Merged-in: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb402)
(cherry picked from commit 84c9e01f10)
2017-05-16 23:02:39 -07:00
Ying Xu
a37b511b67 Merge "Add the new RIL requests and NetworkScanResult."
am: 0727abc423

Change-Id: I41560f522b3c46de4fe1a7a8377a6f2b7af04534
2017-05-16 23:11:24 +00:00
yinxu
84c9e01f10 Add the new RIL requests and NetworkScanResult.
Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb402)
2017-05-16 13:34:59 -07:00
Hall Liu
4b1d35035d Merge "startStreaming for MBMS apis" am: 4b3c44be55 am: 0a4740ec5c
am: 624290d3c8

Change-Id: I6cddee57736b27dfcf88537f4e602d4bf6bc81aa
2017-05-16 20:05:41 +00:00
Grace Chen
73b63bd5ac Merge "Support different SIM power states" am: 0517b719bc am: 1bbe5b21f3
am: c742ab7a44

Change-Id: I71d696c6c725e65357f0704047d534cfc69973d6
2017-05-16 19:58:37 +00:00
Hall Liu
0a4740ec5c Merge "startStreaming for MBMS apis"
am: 4b3c44be55

Change-Id: Id0e2e95387300147ba32ec3a418605901fdb241b
2017-05-16 19:52:26 +00:00
Hall Liu
4b3c44be55 Merge "startStreaming for MBMS apis" 2017-05-16 19:45:12 +00:00
Grace Chen
1bbe5b21f3 Merge "Support different SIM power states"
am: 0517b719bc

Change-Id: Icb6db4d805b4aea701a803eaaec716954f2ebf2a
2017-05-16 19:42:42 +00:00
Grace Chen
0517b719bc Merge "Support different SIM power states" 2017-05-16 19:30:28 +00:00
Grace Chen
b282179000 Support different SIM power states
Test: Verify SIM power states
Bug:  35844036
Merged-In: I968269e88eec40af6e3ca71cbb805a77e016da0f
Change-Id: I968269e88eec40af6e3ca71cbb805a77e016da0f
2017-05-16 10:48:15 -07:00
Hall Liu
fb1ee0ebb2 startStreaming for MBMS apis
Clean up MBMS APIs a bit and make things functional for the
startStreaming/getPlaybackUri APIs.

Test: testapps
Change-Id: I141a4114cc912b98ae22aefb760346061e286f1a
2017-05-15 16:48:52 -07:00