Commit Graph

4724 Commits

Author SHA1 Message Date
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
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
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
Derek Tan
f1328fee0d Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev 2017-07-07 23:12:44 +00:00
Amit Mahajan
c89c50c06a Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651
am: d6c82cde94

Change-Id: Ia6c2ec49d20c53de9b8022cee342589ef2e87172
2017-07-07 02:56:50 +00:00
Amit Mahajan
d6c82cde94 Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am: 730e4a5651

Change-Id: Iab30ea34531682e9e4212aa8930232121aa530bd
2017-07-07 02:37:34 +00:00
TreeHugger Robot
730e4a5651 Merge "Make dun APNs as read-only by default." into oc-dr1-dev 2017-07-06 23:50:32 +00:00
Hall Liu
55f557dc7c Implement getDownloadStatus and add permission
- Implement getDownloadStatus in the manager
- Remove DownloadStatus and add constants in its place to reflect the
status of a single file
- Add ACT_AS_EMBMS_MIDDLEWARE permission

Change-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87
2017-07-06 13:40:09 -07:00
Hall Liu
f4ad19a8d2 Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: af3c9615f1" into oc-dr1-dev-plus-aosp
am: 5ca73a0f98

Change-Id: I6799f02b8d5949027c9215c4542e1f9620c74ba9
2017-07-06 20:21:31 +00:00
Hall Liu
da7669040c Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
am: af3c9615f1

Change-Id: If16e4a6da97e2ee70f2a2ca8444fa24fa9210bf1
2017-07-06 18:47:57 +00:00
Hall Liu
5b754768a2 Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af
2017-07-06 18:24:02 +00:00
Hall Liu
6ba3829074 Merge "Add a reason arg to streamStateUpdated" 2017-07-06 18:08:02 +00:00
Hall Liu
e527be7aa2 Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1
am: 64ec5d3547

Change-Id: Ie96d8b2ce004094b2dfd23939e4b2e19f62307c5
2017-07-06 02:24:36 +00:00
Hall Liu
64ec5d3547 Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a
am: 812d0866b1

Change-Id: I10eca003e37657c6582718c70c39ac7f54badbae
2017-07-06 02:16:11 +00:00
Hall Liu
5e7c98bb6a Merge "Update DownloadRequest API"
am: fa42eea98f

Change-Id: I0b966f0fa2ca3e1c45bf4932654a3bbc1b2d05eb
2017-07-06 02:03:42 +00:00
Hall Liu
fa42eea98f Merge "Update DownloadRequest API" 2017-07-06 01:52:04 +00:00
Hall Liu
6e1d2feef5 Add a reason arg to streamStateUpdated
Change-Id: I6cc48b64aa885672e062b060a0cf58649df17916
2017-06-30 14:41:18 -07:00
Hall Liu
3c1d4d6ef4 Merge "Implement cancelDownload and remove appName" am: 9b43ffcf2f am: 4b1acf4421 am: 4c751c865a
am: 949b625c57

Change-Id: Iafa6c3b23ba2957e8a303f6190b32e801f6c047f
2017-06-29 22:06:23 +00:00
Hall Liu
949b625c57 Merge "Implement cancelDownload and remove appName" am: 9b43ffcf2f am: 4b1acf4421
am: 4c751c865a

Change-Id: I05814ffe8fb4ca2f334d6c0ecd772295bc2c7c63
2017-06-29 21:58:22 +00:00
Hall Liu
4b1acf4421 Merge "Implement cancelDownload and remove appName"
am: 9b43ffcf2f

Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735
2017-06-29 21:45:47 +00:00
Hall Liu
9b43ffcf2f Merge "Implement cancelDownload and remove appName" 2017-06-29 21:33:11 +00:00
Hall Liu
3bedd88cae Update DownloadRequest API
- Add set/getOpaqueData methods so middleware has one thing to persist
- remove id from DownloadRequest since nobody seems to want it
- replace FileServiceInfo with a service ID
- add a FileInfo extra when sending file-completion to the app

Change-Id: I75be3cce923d5d3c74081d344074b4e3c67deff3
2017-06-29 14:31:00 -07:00
yinxu
5311da134a Merge "Use Bundle for inter-process message"
am: db8e4efd5b

Change-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771
2017-06-29 02:05:53 +00:00