Snap for 11157599 from c1c8959e90b9b589adfd58eac240d03f9fedc56d to 24Q1-release (e30ba635) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -560,7 +560,7 @@ public class CarrierPrivilegesTracker extends Handler {
		}

		private void updateCertsForPackage(@NonNull PackageInfo pkg) {
		Set<String> certs = new ArraySet<>();
		Set<String> certs = new ArraySet<>(1);
		List<Signature> signatures = UiccAccessRule.getSignatures(pkg);
		for (Signature signature : signatures) {
		byte[] sha1 = UiccAccessRule.getCertHash(signature, SHA_1);
		@@ -773,7 +773,7 @@ public class CarrierPrivilegesTracker extends Handler {
		return mCachedUids.get(pkgName);
		}

		Set<Integer> uids = new ArraySet<>();
		Set<Integer> uids = new ArraySet<>(1);
		List<UserInfo> users = mUserManager.getUsers();
		for (UserInfo user : users) {
		int userId = user.getUserHandle().getIdentifier();

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

+16 −7

Original line number	Diff line number	Diff line
		@@ -1179,7 +1179,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
		private void addRequest(RILRequest rr) {
		acquireWakeLock(rr, FOR_WAKELOCK);
		Trace.asyncTraceForTrackBegin(
		Trace.TRACE_TAG_NETWORK, "RIL", RILUtils.requestToString(rr.mRequest), rr.mSerial);
		Trace.TRACE_TAG_NETWORK, "RIL", rr.mSerial + "> "
		+ RILUtils.requestToString(rr.mRequest), rr.mSerial);
		synchronized (mRequestList) {
		rr.mStartTimeMs = SystemClock.elapsedRealtime();
		mRequestList.append(rr.mSerial, rr);
		@@ -5404,14 +5405,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
		private void processResponseDoneInternal(RILRequest rr, int rilError, int responseType,
		Object ret) {
		if (rilError == 0) {
		if (isLogOrTrace()) {
		String logStr = rr.serialString() + "< " + RILUtils.requestToString(rr.mRequest)
		+ " " + retToString(rr.mRequest, ret);
		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "< " + RILUtils.requestToString(rr.mRequest)
		+ " " + retToString(rr.mRequest, ret));
		riljLog(logStr);
		}
		Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);
		}
		} else {
		if (isLogOrTrace()) {
		String logStr = rr.serialString() + "< " + RILUtils.requestToString(rr.mRequest)
		+ " error " + rilError;
		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "< " + RILUtils.requestToString(rr.mRequest)
		+ " error " + rilError);
		riljLog(logStr);
		}
		Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);
		}
		rr.onError(rilError, ret);
		}

src/java/com/android/internal/telephony/domainselection/OWNERS

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		# automatically inherit owners from fw/opt/telephony

		hwangoo@google.com
		forestchoi@google.com
		avinashmp@google.com
		mkoon@google.com
		seheele@google.com
		radhikaagrawal@google.com

src/java/com/android/internal/telephony/metrics/DataCallSessionStats.java

+0 −54

Original line number	Diff line number	Diff line
		@@ -18,13 +18,7 @@ package com.android.internal.telephony.metrics;

		import static com.android.internal.telephony.TelephonyStatsLog.DATA_CALL_SESSION__IP_TYPE__APN_PROTOCOL_IPV4;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.net.ConnectivityManager;
		import android.net.Network;
		import android.net.NetworkCapabilities;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.SystemClock;
		import android.telephony.Annotation.ApnType;
		import android.telephony.Annotation.DataFailureCause;
		@@ -61,8 +55,6 @@ public class DataCallSessionStats {
		private long mStartTime;
		@Nullable private DataCallSession mDataCallSession;

		private Network mSystemDefaultNetwork;
		private boolean mIsSystemDefaultNetworkMobile;
		private final PersistAtomsStorage mAtomsStorage =
		PhoneFactory.getMetricsCollector().getAtomsStorage();

		@@ -70,47 +62,8 @@ public class DataCallSessionStats {

		public static final int SIZE_LIMIT_HANDOVER_FAILURES = 15;

		final class DefaultNetworkCallback extends ConnectivityManager.NetworkCallback {
		@Override
		public void onAvailable(@NonNull Network network) {
		mSystemDefaultNetwork = network;
		}

		@Override
		public void onCapabilitiesChanged(@NonNull Network network,
		@NonNull NetworkCapabilities nc) {
		if (network == mSystemDefaultNetwork) {
		mIsSystemDefaultNetworkMobile = nc.hasTransport(
		NetworkCapabilities.TRANSPORT_CELLULAR);
		}
		}

		@Override
		public void onLost(@NonNull Network network) {
		mIsSystemDefaultNetworkMobile = false;
		mSystemDefaultNetwork = null;
		}
		}

		public DataCallSessionStats(Phone phone) {
		mPhone = phone;
		registerSystemDefaultNetworkCallback(phone);
		}

		private void registerSystemDefaultNetworkCallback(@NonNull Phone phone) {
		ConnectivityManager connectivityManager = phone.getContext()
		.getSystemService(ConnectivityManager.class);
		if (connectivityManager != null) {
		HandlerThread handlerThread = new HandlerThread(
		DataCallSessionStats.class.getSimpleName());
		handlerThread.start();
		Handler callbackHandler = new Handler(handlerThread.getLooper());
		DefaultNetworkCallback mDefaultNetworkCallback = new DefaultNetworkCallback();
		connectivityManager.registerSystemDefaultNetworkCallback(
		mDefaultNetworkCallback, callbackHandler);
		} else {
		loge("registerSystemDefaultNetworkCallback: ConnectivityManager is null!");
		}
		}

		/** Creates a new ongoing atom when data call is set up. */
		@@ -148,9 +101,6 @@ public class DataCallSessionStats {
		(currentRat == TelephonyManager.NETWORK_TYPE_IWLAN)
		? 0
		: ServiceStateStats.getBand(mPhone);
		// Limitation: Will not capture IKE mobility between Backup Calling <-> WiFi Calling.
		mDataCallSession.isIwlanCrossSim = currentRat == TelephonyManager.NETWORK_TYPE_IWLAN
		&& mIsSystemDefaultNetworkMobile;
		}

		// only set if apn hasn't been set during setup
		@@ -249,8 +199,6 @@ public class DataCallSessionStats {
		if (mDataCallSession.ratAtEnd != currentRat) {
		mDataCallSession.ratSwitchCount++;
		mDataCallSession.ratAtEnd = currentRat;
		mDataCallSession.isIwlanCrossSim = currentRat == TelephonyManager.NETWORK_TYPE_IWLAN
		&& mIsSystemDefaultNetworkMobile;
		}
		// band may have changed even if RAT was the same
		mDataCallSession.bandAtEnd =
		@@ -340,7 +288,6 @@ public class DataCallSessionStats {
		copy.handoverFailureRat = Arrays.copyOf(call.handoverFailureRat,
		call.handoverFailureRat.length);
		copy.isNonDds = call.isNonDds;
		copy.isIwlanCrossSim = call.isIwlanCrossSim;
		return copy;
		}

		@@ -366,7 +313,6 @@ public class DataCallSessionStats {
		proto.handoverFailureCauses = new int[0];
		proto.handoverFailureRat = new int[0];
		proto.isNonDds = false;
		proto.isIwlanCrossSim = false;
		return proto;
		}

tests/telephonytests/src/com/android/internal/telephony/domainselection/OWNERS

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		# automatically inherit owners from fw/opt/telephony

		hwangoo@google.com
		forestchoi@google.com
		avinashmp@google.com
		mkoon@google.com
		seheele@google.com
		radhikaagrawal@google.com