From 317411561c3d85832e9d2cdb3d81c3763984b7b0 Mon Sep 17 00:00:00 2001 From: gkipnis Date: Wed, 17 Feb 2016 10:09:25 -0800 Subject: Added a receiver to monitor network connection changes The DataUsageService should only run when connected to a Cellular network and not on WiFi. The DataUsageService is only scheduled to be run if connected to a metered network. A network state change receiver monitors networks state changes and starts the scheduling alarm if the new network is metered and the DataUsageService is enabled. --- AndroidManifest.xml | 6 + MODULE_LICENSE_APACHE2 | 0 NOTICE | 190 +++++++++++++++++++++ .../providers/datausage/BootReceiver.java | 10 +- .../datausage/DataUsageConnectivityReceiver.java | 43 +++++ .../providers/datausage/DataUsageService.java | 1 + .../providers/datausage/DataUsageUtils.java | 24 ++- 7 files changed, 271 insertions(+), 3 deletions(-) create mode 100644 MODULE_LICENSE_APACHE2 create mode 100644 NOTICE create mode 100644 src/org/cyanogenmod/providers/datausage/DataUsageConnectivityReceiver.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 40cd622..ad07e34 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -31,6 +31,12 @@ android:exported="true"> + + + + + + diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..c5b1efa --- /dev/null +++ b/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2005-2008, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/src/org/cyanogenmod/providers/datausage/BootReceiver.java b/src/org/cyanogenmod/providers/datausage/BootReceiver.java index 75e8e52..73e2dfb 100644 --- a/src/org/cyanogenmod/providers/datausage/BootReceiver.java +++ b/src/org/cyanogenmod/providers/datausage/BootReceiver.java @@ -19,14 +19,20 @@ package org.cyanogenmod.providers.datausage; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.util.Log; public class BootReceiver extends BroadcastReceiver { private static final String TAG = BootReceiver.class.getSimpleName(); + private static final boolean DEBUG = true; @Override public void onReceive(Context context, Intent intent) { - DataUsageUtils.startDataUsageServiceIfEnabled(context); + boolean qualified = DataUsageUtils.isDataUsageQualified(context); + + // start DataUsage service once the device boots up, but only if + // on qualified network and the service itself is enabled from the Settings->DataUsage + if (qualified) { + DataUsageUtils.startDataUsageServiceIfEnabled(context); + } } } diff --git a/src/org/cyanogenmod/providers/datausage/DataUsageConnectivityReceiver.java b/src/org/cyanogenmod/providers/datausage/DataUsageConnectivityReceiver.java new file mode 100644 index 0000000..375b995 --- /dev/null +++ b/src/org/cyanogenmod/providers/datausage/DataUsageConnectivityReceiver.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.cyanogenmod.providers.datausage; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Log; + + +public class DataUsageConnectivityReceiver extends BroadcastReceiver { + private static final String TAG = DataUsageConnectivityReceiver.class.getSimpleName(); + private static final boolean DEBUG = true; + @Override + public void onReceive(Context context, Intent intent) { + // datausage service is only run for metered mobile connections + boolean qualified = DataUsageUtils.isDataUsageQualified(context); + if (DEBUG) { + Log.v(TAG, "onReceived: qualified: " + qualified); + } + if (qualified) { + // start DataUsage service, but only if enabled + DataUsageUtils.startDataUsageServiceIfEnabled(context); + } else { + // stop DataUsage service + DataUsageUtils.enbDataUsageService(context, false); + } + } +} diff --git a/src/org/cyanogenmod/providers/datausage/DataUsageService.java b/src/org/cyanogenmod/providers/datausage/DataUsageService.java index ce328cc..e59874e 100644 --- a/src/org/cyanogenmod/providers/datausage/DataUsageService.java +++ b/src/org/cyanogenmod/providers/datausage/DataUsageService.java @@ -27,6 +27,7 @@ import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.database.Cursor; +import android.net.ConnectivityManager; import android.net.Uri; import android.os.Handler; import android.os.IBinder; diff --git a/src/org/cyanogenmod/providers/datausage/DataUsageUtils.java b/src/org/cyanogenmod/providers/datausage/DataUsageUtils.java index 5b5ce36..2159760 100644 --- a/src/org/cyanogenmod/providers/datausage/DataUsageUtils.java +++ b/src/org/cyanogenmod/providers/datausage/DataUsageUtils.java @@ -24,6 +24,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.UserInfo; import android.database.Cursor; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; import android.util.Log; import org.cyanogenmod.providers.datausage.R; @@ -141,7 +143,12 @@ public final class DataUsageUtils { public static void enbDataUsageService(Context context, boolean enb) { SharedPreferences prefs = context.getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE); prefs.edit().putBoolean(PREF_ENB_DATA_USAGE_NOTIFY, enb).apply(); - startDataUsageService(context, enb); + // start DataUsage service, but only if on qualified mobile network + // if the service is not started now, it will be started when the network state changes + // and the connected network is qualified for the DataUsage service + if (isDataUsageQualified(context)) { + startDataUsageService(context, enb); + } } public static void startDataUsageService(Context context, boolean enb) { @@ -174,6 +181,21 @@ public final class DataUsageUtils { if (DEBUG) { Log.v(TAG, "startDataUsageServiceIfEnabled: enb: " + enb); } + } + // determine if the currently connected network qualified for the DataUsage service + public static boolean isDataUsageQualified(Context context) { + // only perform DataUsage collection for metered networks + ConnectivityManager connectivityManager = + (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo(); + if (activeNetworkInfo != null) { + boolean isConnected = activeNetworkInfo.isConnected(); + boolean isMobile = activeNetworkInfo.getType() == ConnectivityManager.TYPE_MOBILE; + boolean qualified = isConnected && isMobile && connectivityManager.isActiveNetworkMetered(); + return qualified; + } else { + return false; + } } } -- cgit v1.2.3