Merge "Fixed failed unit test cases" into nyc-mr1-dev (47b07ccc) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1301,7 +1301,8 @@ public class DcTracker extends Handler {
		return false;
		}

		boolean isDataEnabled(boolean checkUserDataEnabled) {
		@VisibleForTesting
		public boolean isDataEnabled(boolean checkUserDataEnabled) {
		synchronized (mDataEnabledLock) {
		if (!(mInternalDataEnabled && (!checkUserDataEnabled \|\| mUserDataEnabled)
		&& (!checkUserDataEnabled \|\| sPolicyDataEnabled)