Snap for 6534196 from 73275fca6699ec991d3d74001d26822ff3463c62 to rvc-release (6b613452) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CarrierPrivilegesTracker.java

+14 −3

Original line number	Diff line number	Diff line
		@@ -77,6 +77,8 @@ import java.util.StringJoiner;
		public class CarrierPrivilegesTracker extends Handler {
		private static final String TAG = CarrierPrivilegesTracker.class.getSimpleName();

		private static final boolean VDBG = false;

		private static final String SHA_1 = "SHA-1";
		private static final String SHA_256 = "SHA-256";

		@@ -421,10 +423,13 @@ public class CarrierPrivilegesTracker extends Handler {
		// Okay because no registrants exist yet
		maybeUpdatePrivilegedUidsAndNotifyRegistrants();

		mLocalLog.log("Initializing state:"
		String msg = "Initializing state:"
		+ " CarrierConfig certs=" + mCarrierConfigCerts
		+ " SIM-loaded certs=" + mUiccCerts
		+ " installed pkgs=" + getObfuscatedPackages());
		+ " SIM-loaded certs=" + mUiccCerts;
		if (VDBG) {
		msg += " installed pkgs=" + getObfuscatedPackages();
		}
		mLocalLog.log(msg);
		}

		private String getObfuscatedPackages() {
		@@ -512,6 +517,12 @@ public class CarrierPrivilegesTracker extends Handler {
		pw.println("CarrierPrivilegesTracker - Log End ----");
		pw.println("CarrierPrivilegesTracker - Privileged UIDs: "
		+ Arrays.toString(mPrivilegedUids));
		pw.println("CarrierPrivilegesTracker - SIM-loaded Certs: " + mUiccCerts);
		pw.println("CarrierPrivilegesTracker - CarrierPrivileged Certs: " + mCarrierConfigCerts);
		if (VDBG) {
		pw.println("CarrierPrivilegesTracker - Obfuscated Pkgs + Certs: "
		+ getObfuscatedPackages());
		}
		}

		/**

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

+6 −8

Original line number	Diff line number	Diff line
		@@ -1277,15 +1277,13 @@ public class DataConnection extends StateMachine {
		}

		// If data is enabled, this data connection can't be for unmetered used only because
		// everyone should be able to use it.
		// everyone should be able to use it if:
		// 1. Device is not roaming, or
		// 2. Device is roaming and data roaming is turned on
		if (mPhone.getDataEnabledSettings().isDataEnabled()) {
		if (!mPhone.getServiceState().getDataRoaming() \|\| mDct.getDataRoamingEnabled()) {
		return false;
		}

		// If the device is roaming and data roaming it turned on, then this data connection can't
		// be for unmetered use only.
		if (mDct.getDataRoamingEnabled() && mPhone.getServiceState().getDataRoaming()) {
		return false;
		}

		// The data connection can only be unmetered used only if all attached APN contexts

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -209,6 +209,7 @@ public class DcTracker extends Handler {
		"extra_handover_failure_fallback";

		private final String mLogTag;
		private final String mLogTagSuffix;

		public AtomicBoolean isCleanupRequired = new AtomicBoolean(false);

		@@ -673,13 +674,12 @@ public class DcTracker extends Handler {
		.createForSubscriptionId(phone.getSubId());
		// The 'C' in tag indicates cellular, and 'I' indicates IWLAN. This is to distinguish
		// between two DcTrackers, one for each.
		String tagSuffix = "-" + ((transportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		? "C" : "I");
		tagSuffix += "-" + mPhone.getPhoneId();
		mLogTag = "DCT" + tagSuffix;
		mLogTagSuffix = "-" + ((transportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		? "C" : "I") + "-" + mPhone.getPhoneId();
		mLogTag = "DCT" + mLogTagSuffix;

		mTransportType = transportType;
		mDataServiceManager = new DataServiceManager(phone, transportType, tagSuffix);
		mDataServiceManager = new DataServiceManager(phone, transportType, mLogTagSuffix);

		mResolver = mPhone.getContext().getContentResolver();
		mAlarmManager =
		@@ -715,7 +715,7 @@ public class DcTracker extends Handler {
		mHandlerThread = new HandlerThread("DcHandlerThread");
		mHandlerThread.start();
		Handler dcHandler = new Handler(mHandlerThread.getLooper());
		mDcc = DcController.makeDcc(mPhone, this, mDataServiceManager, dcHandler, tagSuffix);
		mDcc = DcController.makeDcc(mPhone, this, mDataServiceManager, dcHandler, mLogTagSuffix);
		mDcTesterFailBringUpAll = new DcTesterFailBringUpAll(mPhone, dcHandler);

		mDataConnectionTracker = this;
		@@ -738,6 +738,7 @@ public class DcTracker extends Handler {
		@VisibleForTesting
		public DcTracker() {
		mLogTag = "DCT";
		mLogTagSuffix = null;
		mTelephonyManager = null;
		mAlarmManager = null;
		mPhone = null;
		@@ -5056,9 +5057,16 @@ public class DcTracker extends Handler {

		private void onDataServiceBindingChanged(boolean bound) {
		if (bound) {
		if (mDcc == null) {
		mDcc = DcController.makeDcc(mPhone, this, mDataServiceManager,
		new Handler(mHandlerThread.getLooper()), mLogTagSuffix);
		}
		mDcc.start();
		} else {
		mDcc.dispose();
		// dispose sets the associated Handler object (StateMachine#mSmHandler) to null, so mDcc
		// needs to be created again (simply calling start() on it after dispose will not work)
		mDcc = null;
		}
		mDataServiceBound = bound;
		}