Commit Graph

4744 Commits

Author SHA1 Message Date
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
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
Jeff Sharkey
53313d7e81 Iterate NetworkPolicy towards SubscriptionPlan.
Add new SubscriptionPlan API to describe the various types of carrier
data plans.  Internally the OS will only use the first plan for
driving policy, but it will blindly plumb through the details for
Settings to display any secondary plans.

As part of getting Settings ready to roll towards SubscriptionPlan,
reduce references to NetworkPolicy internal fields.  All usage cycle
details are now obtained from an Iterator which converts to
SubscriptionPlan under the hood.

Replace all data usage cycle calculation with new SubscriptionPlan
implementation, and retrofit large suite of existing tests to
exercise and verify the new logic.

Offer a debugging property that can be used to return "fake" plan
examples for testing.

Bug: 63391323
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I889c653980eeb7887abdfa4f5b6986f35855ee6d
2017-07-14 16:18:40 -06:00
Naveen Kalla
7e15c58085 resolve merge conflicts of b78661052c to oc-dr1-dev-plus-aosp
Bug: 62933474
Test: Build
Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 20:49:08 -07:00
Hall Liu
4622acb950 Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe am: d98024a1f9 am: f83fb827a7
am: 7b8d8578de

Change-Id: Iea8b54a10778494a0aee969ebf70fdc4e5e86cf7
2017-07-14 03:01:09 +00:00
Hall Liu
7b8d8578de Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe am: d98024a1f9
am: f83fb827a7

Change-Id: I90910fd62a74d7518d69c409eeb6cc8f4a7bb6f2
2017-07-14 02:54:29 +00:00
Hall Liu
d98024a1f9 Merge "Clean up streaming API docs and organize errors"
am: d2c8dcfcfe

Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab
2017-07-14 02:43:10 +00:00
TreeHugger Robot
f9dd150ea6 Merge "Convert CDMA caller ID codes while roaming on 3GPP networks" 2017-07-14 00:31:29 +00:00
Naveen Kalla
4ca9d2ee0e Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Simulate Roaming scenario and ensure that the dial
      string is converted as expected.

Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 15:27:33 -07:00
Naveen Kalla
abd2842ce1 Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Simulate Roaming scenario and ensure that the dial
      string is converted as expected.

Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 15:08:51 -07:00
Hall Liu
19b49f6c3c Merge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222 am: 9888af1dfc
am: 81d9c6fe71

Change-Id: Ida7f8cfd440553658108688b84f866dddafa3166
2017-07-12 23:57:21 +00:00
Hall Liu
46cbcd1b4a Clean up streaming API docs and organize errors
* Implement listPendingDownloads and resetDownloadKnowledge
* Bring MbmsStreamingManager docs in line with vendor-side API docs.
* Remove activeStreamingServicesUpdated
* Reorganize the errors in MbmsException into categories.
* Add some vendor API docs for file-download

Change-Id: Ia29066ea6f2c0414171cffa1ae11bb467f187bee
2017-07-12 16:53:12 -07:00
Hall Liu
81d9c6fe71 Merge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222
am: 9888af1dfc

Change-Id: I98d30f379072302a5e76a8b157d8aecdd1616235
2017-07-12 23:44:51 +00:00
Hall Liu
d45a007222 Merge "Implement getDownloadStatus and add permission"
am: 2fa880d016

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959
2017-07-12 23:27:49 +00:00
Derek Tan
a4a79df9a4 Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev am: f1328fee0d
am: 0eba3cb020

Change-Id: I435e1a197b44eeff8b7453e2b9f88e9a901c285d
2017-07-07 23:31:37 +00:00
Derek Tan
0eba3cb020 Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
am: f1328fee0d

Change-Id: I8646c7983330beaf90f7935d01675f33df2bf7ef
2017-07-07 23:18:54 +00:00