Merge "Enable mobile data always on." am: 7ab1654533 am: 0df74d1ee7 am: e50c60e1f1

am: f9f8abce19

Change-Id: I8d61c1a22a702cbd23638d46dfad36365b29180c
This commit is contained in:
Lorenzo Colitti
2017-01-17 06:56:53 +00:00
committed by android-build-merger

View File

@@ -883,7 +883,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void handleMobileDataAlwaysOn() { private void handleMobileDataAlwaysOn() {
final boolean enable = (Settings.Global.getInt( 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); final boolean isEnabled = (mNetworkRequests.get(mDefaultMobileDataRequest) != null);
if (enable == isEnabled) { if (enable == isEnabled) {
return; // Nothing to do. return; // Nothing to do.