Compilation Fix. (3215193e) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -4731,7 +4731,6 @@ public final class Settings {
		* @hide
		*/

		/**
		public static final String WIMAX_ON = "wimax_on";

		/**

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java

+8 −28

Original line number	Diff line number	Diff line
		@@ -33,20 +33,19 @@ import android.net.NetworkStatsHistory;
		import android.net.NetworkTemplate;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		<<<<<<< HEAD:packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataController.java
		import android.provider.Settings;
		=======
		>>>>>>> android-5.1.0_r1:packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.format.DateUtils;
		import android.text.format.Time;
		import android.util.Log;

		import com.android.systemui.statusbar.policy.NetworkController.DataUsageInfo;

		import java.util.Date;
		import java.util.Locale;

		public class MobileDataControllerImpl implements NetworkController.MobileDataController {
		public class MobileDataControllerImpl {
		private static final String TAG = "MobileDataController";
		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

		@@ -64,7 +63,6 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon

		private INetworkStatsSession mSession;
		private Callback mCallback;
		private NetworkControllerImpl mNetworkController;

		public MobileDataControllerImpl(Context context) {
		mContext = context;
		@@ -75,10 +73,6 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		mPolicyManager = NetworkPolicyManager.from(mContext);
		}

		public void setNetworkController(NetworkControllerImpl networkController) {
		mNetworkController = networkController;
		}

		private INetworkStatsSession getSession() {
		if (mSession == null) {
		try {
		@@ -117,9 +111,7 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		if (session == null) {
		return warn("no stats session");
		}
		NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(subscriberId);
		template = NetworkTemplate.normalize(template, mTelephonyManager.getMergedSubscriberIds());

		final NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(subscriberId);
		final NetworkPolicy policy = findNetworkPolicy(template);
		try {
		final NetworkStatsHistory history = mSession.getHistoryForNetwork(template, FIELDS);
		@@ -165,9 +157,6 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		} else {
		usage.warningLevel = DEFAULT_WARNING_LEVEL;
		}
		if (usage != null) {
		usage.carrier = mNetworkController.getMobileNetworkName();
		}
		return usage;
		} catch (RemoteException e) {
		return warn("remote call failed");
		@@ -202,13 +191,8 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		}

		public void setMobileDataEnabled(boolean enabled) {
		<<<<<<< HEAD:packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataController.java
		mTelephonyManager.setDataEnabledUsingSubId(
		mTelephonyManager.setDataEnabled(
		SubscriptionManager.getDefaultDataSubId(), enabled);
		=======
		Log.d(TAG, "setMobileDataEnabled: enabled=" + enabled);
		mTelephonyManager.setDataEnabled(enabled);
		>>>>>>> android-5.1.0_r1:packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java
		if (mCallback != null) {
		mCallback.onMobileDataEnabled(enabled);
		}
		@@ -218,23 +202,19 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		// require both supported network and ready SIM
		return mConnectivityManager.isNetworkSupported(TYPE_MOBILE)
		&& mTelephonyManager.getSimState(
		SubscriptionManager.getDefaultDataPhoneId()) == SIM_STATE_READY;
		SubscriptionManager.from(mContext).getDefaultDataPhoneId()) == SIM_STATE_READY;
		}

		public boolean isMobileDataEnabled() {
		return Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.MOBILE_DATA + SubscriptionManager.getDefaultDataPhoneId(), 0) != 0;
		Settings.Global.MOBILE_DATA +
		SubscriptionManager.from(mContext).getDefaultDataPhoneId(), 0) != 0;
		}

		private static String getActiveSubscriberId(Context context) {
		final TelephonyManager tele = TelephonyManager.from(context);
		<<<<<<< HEAD:packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataController.java
		final String actualSubscriberId =
		tele.getSubscriberId(SubscriptionManager.getDefaultDataSubId());
		=======
		final String actualSubscriberId = tele.getSubscriberId(
		SubscriptionManager.getDefaultDataSubId());
		>>>>>>> android-5.1.0_r1:packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java
		return actualSubscriberId;
		}

services/core/java/com/android/server/am/ProcessList.java

+5 −25

Original line number	Diff line number	Diff line
		@@ -271,7 +271,6 @@ final class ProcessList {
		Slog.i("XXXXXX", "minfree_adj=" + minfree_adj + " minfree_abs=" + minfree_abs);
		}

		<<<<<<< HEAD
		// We've now baked in the increase to the basic oom values above, since
		// they seem to be useful more generally for devices that are tight on
		// memory than just for 64 bit. This should probably have some more
		@@ -284,38 +283,19 @@ final class ProcessList {
		}

		for (int i=0; i<mOomAdj.length; i++) {
		int low = 0;
		int high = 0;
		int low = mOomMinFreeLow[i];
		int high = mOomMinFreeHigh[i];

		if (is64bit) {
		// On 64 bit devices, we consume more baseline RAM, because 64 bit is cool!
		// To avoid being all pagey and stuff, scale up the memory levels to
		// give us some breathing room.
		Slog.i("XXXXXX", "choosing minFree values for 64 Bit");
		low = mOomMinFreeLow[i];
		high = mOomMinFreeHigh[i];

		mOomMinFree[i] = (int)(low + ((high-low)*scale));
		// More scaling up not required yet
		// mOomMinFree[i] = (3*mOomMinFree[i])/2;
		// Increase the high min-free levels for cached processes for 64-bit
		if (i == 4) high = (high*3)/2;
		else if (i == 5) high = (high*7)/4;

		} else {
		Slog.i("XXXXXX", "choosing minFree values for 32 Bit");
		low = mOomMinFreeLow32Bit[i];
		high = mOomMinFreeHigh32Bit[i];

		mOomMinFree[i] = (int)(low + ((high-low)*scale));
		=======
		final boolean is64bit = Build.SUPPORTED_64_BIT_ABIS.length > 0;

		for (int i=0; i<mOomAdj.length; i++) {
		int low = mOomMinFreeLow[i];
		int high = mOomMinFreeHigh[i];
		if (is64bit) {
		// Increase the high min-free levels for cached processes for 64-bit
		if (i == 4) high = (high*3)/2;
		else if (i == 5) high = (high*7)/4;
		>>>>>>> android-5.1.0_r1
		}
		mOomMinFree[i] = (int)(low + ((high-low)*scale));
		}