Commit Graph

4707 Commits

Author SHA1 Message Date
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
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
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
Treehugger Robot
db8e4efd5b Merge "Use Bundle for inter-process message" 2017-06-29 01:51:04 +00:00
Hall Liu
9f116ef480 Implement cancelDownload and remove appName
Implements the cancelDownload call
Removes appName as an argument from all EMBMS-related apis
Implements the cross-filesystem move method in MbmsDownloadReceiver

Change-Id: Ie8ebfccca4fbb3d69289beb2ed77101fe2c7727f
2017-06-28 15:00:56 -07:00
Brad Ebinger
58d47a6f04 Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev 2017-06-28 21:06:34 +00:00
Hall Liu
9011975ce1 Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18eb am: 761bad1c53 am: 8f42a3a281
am: 5f48b1bc02

Change-Id: I12300a1e96b97cfa47e7ff82e2ac50e7e9932eab
2017-06-28 20:59:45 +00:00
Hall Liu
fa177aca74 Add download request tokens and enforce destination clear am: 2043f70acb am: 8763c625a3 am: fc156f357a
am: b70e48b33b

Change-Id: I8e9dbb203bb91c5ef32c38e0cb7de6f854e05ce8
2017-06-28 20:58:37 +00:00
Hall Liu
5f48b1bc02 Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18eb am: 761bad1c53
am: 8f42a3a281

Change-Id: Ib6c8e17b0d6664ded17ce8eb4314124eb676713c
2017-06-28 20:53:00 +00:00
Hall Liu
b70e48b33b Add download request tokens and enforce destination clear am: 2043f70acb am: 8763c625a3
am: fc156f357a

Change-Id: I929fd3306a7bb8bbc2eeb31eb1732c99ec0fb743
2017-06-28 20:51:57 +00:00
Brad Ebinger
ce07d61ce7 IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.

Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.

Notify Ims state change only for the supported feature state
change to clients.

Test: Manual
Bug: 62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit 913e11fcdf)
2017-06-28 20:39:23 +00:00
Hall Liu
761bad1c53 Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am: c2f33f18eb

Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
2017-06-28 20:36:49 +00:00
Hall Liu
8763c625a3 Add download request tokens and enforce destination clear
am: 2043f70acb

Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
2017-06-28 20:35:54 +00:00
Hall Liu
c2f33f18eb Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
  Implement the cleanup action in MbmsDownloadReceiver
  Add download request tokens and enforce destination clear
2017-06-28 20:26:15 +00:00
yinxu
77e6f9909a Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.

Cherry-picked cleanly from:
https://googleplex-android-review.googlesource.com/#/c/2467157/

Test: Telephony sanity tests
Bug: 30954762

Merged-in: I77945b247530b85c0b82876d528549498a711550
Changg-Id: I77945b247530b85c0b82876d528549498a711550
(cherry picked from commit 5604943709)

Change-Id: Iec4043e611a8f58733a361ec9a52fc74e1c974d5
2017-06-28 10:58:31 -07:00
Jeff Davidson
ad60b37575 Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev am: f28843dd3f
am: 53ad2499f1

Change-Id: I538f0405811b0df28960acdb6f275689f19185dc
2017-06-28 17:41:26 +00:00
Jeff Davidson
53ad2499f1 Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
am: f28843dd3f

Change-Id: Ibd7c9c673c9272696cd955ddc50d4b55755d5429
2017-06-28 17:33:01 +00:00
Jeff Davidson
f28843dd3f Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev 2017-06-28 17:23:49 +00:00
Ying Xu
ed38bfdc8f Merge "Use Bundle for inter-process message" into oc-dr1-dev am: e5ad3821e3
am: c567b16604

Change-Id: Icc35859aec67db25113cc7cb86fc3af75886c65b
2017-06-28 16:59:26 +00:00
Ying Xu
c567b16604 Merge "Use Bundle for inter-process message" into oc-dr1-dev
am: e5ad3821e3

Change-Id: Ia847e54c387fc145b36313048860aa6b281d4c56
2017-06-28 16:54:19 +00:00