Commit Graph

4758 Commits

Author SHA1 Message Date
Jonathan Basseri
2b9aa9e9d1 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: I541b445b410329798acdaaaccc50955cd1574ae2
(cherry picked from commit 83c25b8ce17c3ce387d87d5f36182645e686540e)
2017-08-03 14:16:02 -07:00
Junda Liu
d249a0061b Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev
am: 858a27c0b6

Change-Id: Id080a91ff04953a6c878ed18551cf71e20742e32
2017-08-02 18:17:54 +00:00
TreeHugger Robot
858a27c0b6 Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev 2017-08-02 18:09:41 +00:00
Jonathan Basseri
e022fa6aae Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am: 7728849a39 am: 0fed7e3282
am: 96bfbcdcd4

Change-Id: I918dc3e55ca50416d6a92341e1f8b8eef33415fd
2017-08-02 02:37:46 +00:00
Jonathan Basseri
96bfbcdcd4 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am: 7728849a39
am: 0fed7e3282

Change-Id: If811c7aa40c5be4b0ffcfa5addef8c4b147a1c71
2017-08-02 02:27:55 +00:00
Jonathan Basseri
ab7c6a22a9 Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6 am: aaeca1e977
am: 89a2a41572

Change-Id: I55d117ed2e61cd54b9e64034b0e5df8be00ce9e6
2017-08-02 02:07:20 +00:00
Jonathan Basseri
7728849a39 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am: 85a215bae7

Change-Id: I30dddd90e5984519219865752f563a45962be593
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

Change-Id: I9935e8825683fb23fc03e38a93380add8fe4408a
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.

Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
2017-08-02 01:10:47 +00:00
Jonathan Basseri
02cc8151a6 Merge "Move getNetworkCountryIso impl from TM to PIM."
am: 58bbef15d8

Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
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
Jeff Sharkey
284eab179c Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev
am: 2c131cafae

Change-Id: I1f1d834712004b520a02d3116de945c668236f81
2017-07-30 00:15:17 +00:00
Rajeev Kumar
8040c388c1 Merge "Fix NPE in calling getSubscriptionPlans method." into oc-mr1-dev
am: d4c36badff

Change-Id: I29fab7adc623a8d18e8e8ac5524d78376690e290
2017-07-30 00:12:35 +00:00
TreeHugger Robot
2c131cafae Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev 2017-07-30 00:09:04 +00:00
TreeHugger Robot
d4c36badff Merge "Fix NPE in calling getSubscriptionPlans method." into oc-mr1-dev 2017-07-30 00:05:07 +00:00
Jeff Sharkey
b7479988d2 Migrate plans to @SystemApi, evolve permissions.
We're not yet ready to commit to SubscriptionPlan as public API, so
relax to be @SystemApi instead.  Add a new MANAGE_SUBSCRIPTION_PLANS
permission that we require apps to hold, unless they've been
delegated access via a trusted CarrierService.

Since several apps have the ability to provide plans for a single
subId, we now remember the "owner" who set the current plan
information, and we refuse to leak plan information beyond the app
that originally set it.

Relax permissions check to not require READ_PHONE_STATE, since we're
only returning data that an app provided to us earlier.  Also fix
NPE when SubscriptionInfo is missing.

Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 63997177, 63928277, 64156138, 63903381
Change-Id: If503378ef406dcaec438c9b41e837e0a821a3ef4
2017-07-28 16:59:14 -06:00
Hall Liu
66299eb482 Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2 am: 8c4179e88c am: 7a83a8ac77
am: 76716535d9

Change-Id: I8dd83d01a7511968ed51a80ad358a48e50c3d1e7
2017-07-28 03:11:49 +00:00
Hall Liu
76716535d9 Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2 am: 8c4179e88c
am: 7a83a8ac77

Change-Id: Ia07b24d0b75d39144be8fb211ca6c2d84e24718a
2017-07-28 02:57:24 +00:00
Hall Liu
8c4179e88c Merge "Un-hide the MBMS streaming APIs"
am: a50e17aea2

Change-Id: Icd8ebf0e351914cdfb0f0c15343e2d2024706d6b
2017-07-28 02:40:20 +00:00
Brad Ebinger
50e2ebe0c7 Merge "Change IMS callback AIDLs to be oneway" into oc-dr1-dev am: cfcac665c1
am: 0f48181e16

Change-Id: Ie650e896cc0ff5ddd6329fb4be5e469453a9ee37
2017-07-27 23:03:54 +00:00
Brad Ebinger
0f48181e16 Merge "Change IMS callback AIDLs to be oneway" into oc-dr1-dev
am: cfcac665c1

Change-Id: I0e049166ddf3604d312748b63a94fa6ebe77c29d
2017-07-27 22:50:53 +00:00
Brad Ebinger
276e2fac5f Merge "Change IMS callback AIDLs to be oneway" into oc-dr1-dev
am: cfcac665c1

Change-Id: I2b4249a9d9422c80ce6da3343ed39476153f8ea0
2017-07-27 22:50:46 +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
Brad Ebinger
14c4f3db48 Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.

This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.

Bug: 63137625
Test: Manual
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
2017-07-27 12:57:03 -07:00
Rajeev Kumar
c8ac4f3b54 Fix NPE in calling getSubscriptionPlans method.
Bug:63999806
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Change-Id: I22b013d7af60c6722c7748c88888ddbe1b7a414f
2017-07-26 17:13:58 -07:00
Junda Liu
61722586f8 Deprecate KEY_EDITABLE_TETHER_APN_BOOL.
Bug: b/63714717
Test: manual
Change-Id: I943a8a20a63c35017e1e4110f49ba5640d0b8a56
2017-07-25 14:50:49 -07:00
Hall Liu
8cbab2292e Merge "Make slight API and doc adjustments" am: b7e10650d8 am: 14be4e65b2 am: 0f18557df8
am: a3011a0401

Change-Id: Ie13260ff426a0a160c44a1a7f05a2f3b2e86548a
2017-07-21 21:35:15 +00:00
Hall Liu
a3011a0401 Merge "Make slight API and doc adjustments" am: b7e10650d8 am: 14be4e65b2
am: 0f18557df8

Change-Id: I84aa982760377be0df6f8fbca6d5a32d1036f16a
2017-07-21 21:29:24 +00:00
Hall Liu
14be4e65b2 Merge "Make slight API and doc adjustments"
am: b7e10650d8

Change-Id: I96a361924ddff300eb36933bed67d30ec00e8f87
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
Jeff Sharkey
84c6684bba Merge "Expose SubscriptionPlan API." into oc-mr1-dev 2017-07-21 17:14:30 +00:00
Amit Mahajan
d57fcca823 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am: 37a9991be9

Change-Id: I5b5499ed9528aab6718ffe325afe8f51265fd548
2017-07-20 20:59:52 +00:00
Amit Mahajan
f4292bacf9 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am: 37a9991be9

Change-Id: Ib0cd3d66a4eef9d93e8f952dfd528d0cf714e8e5
2017-07-20 20:58:39 +00:00
Jeff Sharkey
17bebd2fd7 Expose SubscriptionPlan API.
Clean up SubscriptionPlan, add docs, and expose as public API.

Deprecate older constants in CarrierConfigManager, and point users
towards new API.  (The goal of CarrierConfigManager is to express
key/value pairs that are identical for all users on a particular
carrier, not to configure details that vary between users.)

Since a CarrierService may itself not have access to the plan
details, allow them to "delegate" the capability to configure plans
to another package name.

Factor out new RecurrenceRule class which is used by both
NetworkPolicy and SubscriptionPlan internally.  Polish it to support
arbitrary periods, and continue to test it through NPMST.

Bug: 63391323
Test: bit FrameworksCoreTests:android.util.RecurrenceRuleTest
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I93fae4a43e58e9e4c32f8bf345a257dcd607f088
2017-07-20 14:55:57 -06: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
bfa50d4852 Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9 am: 12286b2608
am: 7acfec846b

Change-Id: If16b8c107d39c5791ea8c3b3b28afd4f37500b44
2017-07-20 00:49:58 +00:00
Robert Greenwalt
7acfec846b Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9
am: 12286b2608

Change-Id: Iff3707dab4ee737e5de2b1b8bded811f919553a8
2017-07-20 00:42:21 +00:00
Robert Greenwalt
5f047a68d9 Merge "Add details to Download progress callback"
am: b440b572d7

Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011
2017-07-20 00:30:50 +00:00
Ta-wei Yen
5263ad6f8a Merge "Make EXTRA_IS_REFRESH for voicemail notification public" 2017-07-20 00:19:37 +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
4595ad22fb Merge "initial value for data_roaming based on carrier" into oc-dr1-dev am: 068397a319
am: 47208e2cf5

Change-Id: I3d2af92b69f3a5736323900c27dcecc096eb1ab7
2017-07-19 03:17:53 +00:00
Chen Xu
47208e2cf5 Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
am: 068397a319

Change-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31
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
Ta-wei Yen
89234305b2 Make EXTRA_IS_REFRESH for voicemail notification public
This extra is added in ag/2333070 to let the dialer know if a
notification should be silent since the user has alread been notified

Change-Id: Ib2b4ab4cfa1c4baaef4eceb6fa1dab6a8fcfb84d
Fixes: 62202833
Test: manual - leave voicemail, toggle airplane mode.
2017-07-18 17:35:36 -07: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
TreeHugger Robot
42b4446b0e Merge "Iterate NetworkPolicy towards SubscriptionPlan." 2017-07-15 19:57:08 +00:00