Merge "Merge Android10 QPR1 into AOSP master" (2137275c) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -415,8 +415,8 @@ public class CellBroadcastHandler extends WakeLockStateMachine {
		}

		private boolean hasPermission(String permission) {
		return PermissionChecker.checkCallingOrSelfPermissionForDataDelivery(mContext, permission)
		== PERMISSION_GRANTED;
		return PermissionChecker.checkCallingOrSelfPermissionForDataDelivery(mContext,
		permission) == PERMISSION_GRANTED;
		}

		private final LocationListener mLocationListener = new LocationListener() {

+2 −2

Original line number	Diff line number	Diff line
		@@ -83,8 +83,8 @@ public class ApnSettingUtils {
		*/
		public static boolean mvnoMatches(IccRecords r, int mvnoType, String mvnoMatchData) {
		if (mvnoType == ApnSetting.MVNO_TYPE_SPN) {
		if ((r.getServiceProviderName() != null)
		&& r.getServiceProviderName().equalsIgnoreCase(mvnoMatchData)) {
		String spn = r.getServiceProviderNameWithBrandOverride();
		if ((spn != null) && spn.equalsIgnoreCase(mvnoMatchData)) {
		return true;
		}
		} else if (mvnoType == ApnSetting.MVNO_TYPE_IMSI) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -1228,7 +1228,8 @@ public class EuiccController extends IEuiccController.Stub {

		final PackageInfo info;
		try {
		info = mPackageManager.getPackageInfo(callingPackage, PackageManager.GET_SIGNATURES);
		info = mPackageManager.getPackageInfo(callingPackage,
		PackageManager.GET_SIGNING_CERTIFICATES);
		} catch (PackageManager.NameNotFoundException e) {
		Log.e(TAG, "Calling package valid but gone");
		return false;

+6 −1

Original line number	Diff line number	Diff line
		@@ -2794,8 +2794,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		}
		foregroundImsPhoneCall.merge(peerImsPhoneCall, ImsPhoneCall.State.ACTIVE);

		try {
		final ImsPhoneConnection conn = findConnection(call);
		try {
		log("onCallMerged: ImsPhoneConnection=" + conn);
		log("onCallMerged: CurrentVideoProvider=" + conn.getVideoProvider());
		setVideoCallProvider(conn, call);
		@@ -2823,6 +2823,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		// Reset the flag.
		call.resetIsMergeRequestedByConf(false);
		}

		// Notify completion of merge
		if (conn != null) {
		conn.handleMergeComplete();
		}
		logState();
		}

+18 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.internal.telephony.uicc;

		import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.os.AsyncResult;
		@@ -742,6 +743,23 @@ public abstract class IccRecords extends Handler implements IccConstants {
		return mSpn;
		}

		/**
		* Return Service Provider Name stored in SIM (EF_SPN=0x6F46) or in RUIM (EF_RUIM_SPN=0x6F41) or
		* the brand override. The brand override has higher priority than the SPN from SIM.
		*
		* @return service provider name.
		*/
		@Nullable
		public String getServiceProviderNameWithBrandOverride() {
		if (mParentApp != null && mParentApp.getUiccProfile() != null) {
		String brandOverride = mParentApp.getUiccProfile().getOperatorBrandOverride();
		if (!TextUtils.isEmpty(brandOverride)) {
		return brandOverride;
		}
		}
		return mSpn;
		}

		protected void setServiceProviderName(String spn) {
		if (!TextUtils.equals(mSpn, spn)) {
		mSpn = spn != null ? spn.trim() : null;