commit cb44b8d85aa6e998b7ab7d752c0b2772fe12ba8d
author Lorenzo Colitti <lorenzo@google.com> Tue Jan 17 04:31:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 17 04:31:00 2017 +0000
tree c6711b8213d373fa72d6c1415c5a3e5d09b54016
parent 5c610492c89ce317edb69ca711f0ccb7da4490c9
parent fcfa8c02ad27dc8a45fb590d8317fb785ed8e979

Merge "Enable mobile data always on." am: 6e4fe6b37f
am: fcfa8c02ad

Change-Id: Ie2b6887021585a2e7246d66603dadc8d0fa1bd94

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 750b841..d95e1a0 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -883,7 +883,7 @@
 
     private void handleMobileDataAlwaysOn() {
         final boolean enable = (Settings.Global.getInt(
-                mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON, 0) == 1);
+                mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON, 1) == 1);
         final boolean isEnabled = (mNetworkRequests.get(mDefaultMobileDataRequest) != null);
         if (enable == isEnabled) {
             return;  // Nothing to do.