4664 Commits

Author SHA1 Message Date
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
TreeHugger Robot
d6fb3081d9 Merge "Add device and carrier flags for video calling fallback" 2017-06-02 23:35:49 +00:00
Brad Ebinger
a5ce1b4483 Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6 am: bbe9e26247 am: 99533575b2
am: ab9ad6446a

Change-Id: I50ec5d2c4646592d7633e2e453dfa342b4c2cbcf
2017-06-02 22:40:53 +00: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
Robert Greenwalt
47c2a3e93e Changed Locale in ServiceInfo to a list.
EMBMS advertises all the locales the content is available for.
Query currently out for how a client app selects the locale it
wants, but this change reflects what the carrier gives out for
info.

Test: builds
Change-Id: Ie2bb0f73784514d26eefb919649da761a379ea2b
2017-06-02 14:54:16 -07:00
Ta-wei Yen
9d20d98919 Add device and carrier flags for video calling fallback
These flags let the system dialer/contacts/SMS app determine if
integration with video calling apps are allowed if the carrier video
calling is not available.

EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK in PhoneAccount.getExtras()
should be checked first. This flag is disabled by default and OEMs
will need to enable it.

If the device supports the fallback, then
CarrierConfigManager.KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL should be
checked so individual carriers can ban the feature. This flag is
allowed by default.

Change-Id: Id46f684254402acb9142f87684ddff2d830f1701
Fixes: 62264468
Test: manual
2017-06-02 14:01:12 -07: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
pkanwar
232573f50f 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-02 08:56:13 -07:00
Robert Greenwalt
3d98911973 Add updateMethod callback
Allows middleware to let us know if we're getting streaming
content via bcast or unicast.

Test: test-app
Change-Id: Iab63d62a2132fdd71acc81de4ca68fc347ecb4af
2017-06-01 13:27:01 -07:00
Robert Greenwalt
7e02821d7b Merge "Move appName inside Downloadrequest." am: 142a392b75 am: 196cb3dff6 am: 7c3314f19c
am: c593bd3cc7

Change-Id: Ic957a8056b96e0ad2da7c5529aa54c2e7a969e0e
2017-06-01 17:31:08 +00: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
b5c3a138f8 Merge "Ensure null/empty phone number does not crash international number check." into oc-dev am: 0f542b48fb
am: 58e8a224e3

Change-Id: I14a17436328f6324842cbc7c257baf9e4cf60c7f
2017-06-01 07:22:47 +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
Jack Yu
a3adf3363b Merge "Added video calling data usage per-uid support" 2017-05-31 01:29:20 +00:00
Jack Yu
f9d559ce7c 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

Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
2017-05-30 16:04:00 -07:00
Hall Liu
d01a9a4f1c Merge "Add new error codes in MbmsException" am: 8e7057ccf3 am: 20d98578f2 am: aac7e3a182
am: b2a5eceb2f

Change-Id: I4ecca51f60b02f31554dfab3efe0fed96f8b6ea8
2017-05-30 13:51:31 +00: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
2cbc277dc0 Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840 am: 689edc736f" into oc-dev-plus-aosp
am: f5fb04573b

Change-Id: I3447422054e0f563e9314686c1638c43e7df296e
2017-05-25 23:50:59 +00: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
1077aac2a8 Merge "Support RRO for emergency number conversion map" am: 671680e504 am: 8498a6cffd am: ddd73513e6
am: 8187781e37

Change-Id: I80f11d2c105eeeb08f37f9b6083b9709cae5453f
2017-05-24 20:46:26 +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
Jack Yu
7dc56eedf3 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

Change-Id: I46c9e1a15dd0dd40811d5a959d558fc78608b127
2017-05-22 11:29:30 -07:00
Hall Liu
ceea8fdc8f Merge "Implement stopStreaming API for MBMS" am: e245bf9067 am: a7fffdc0d9 am: efa377cbb6
am: 3ae2ef069e

Change-Id: Iea0f3d4b27a45b8788842b76debef6123b037cd7
2017-05-19 23:01:20 +00:00
Hall Liu
e788f4ea9e Update documentation for streaming methods
Update return code/exception documentation in the base class for
middleware implementations of MbmsStreamingService.

Test: all comment changes
Change-Id: Ia8dadf025b53170627691f4ff9fecbb85bffa10b
2017-05-19 15:57:12 -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 2ce1b38e85af 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