Merge "Cleaned up the flag enforce_telephony_feature_mapping_for_public_apis" into main (14019d5e) · Commits · e / os / android_frameworks_base

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.telephony.emergency.EmergencyNumber;
		import android.util.Log;

		import com.android.internal.annotations.KeepForWeakReference;
		import com.android.internal.telephony.flags.Flags;

		import java.util.concurrent.TimeUnit;

		@@ -146,10 +145,6 @@ public class GpsNetInitiatedHandler {
		< emergencyExtensionMillis);
		boolean isInEmergencyCallback = false;
		boolean isInEmergencySmsMode = false;
		if (!Flags.enforceTelephonyFeatureMappingForPublicApis()) {
		isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode();
		isInEmergencySmsMode = mTelephonyManager.isInEmergencySmsMode();
		} else {
		PackageManager pm = mContext.getPackageManager();
		if (pm != null && pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CALLING)) {
		isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode();
		@@ -157,7 +152,6 @@ public class GpsNetInitiatedHandler {
		if (pm != null && pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING)) {
		isInEmergencySmsMode = mTelephonyManager.isInEmergencySmsMode();
		}
		}
		return mIsInEmergencyCall \|\| isInEmergencyCallback \|\| isInEmergencyExtension
		\|\| isInEmergencySmsMode;
		}

+5 −7

Original line number	Diff line number	Diff line
		@@ -2816,14 +2816,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		if (!checkNotifyPermission("notifyEmergencyNumberList()")) {
		return;
		}
		if (Flags.enforceTelephonyFeatureMappingForPublicApis()) {
		if (!mContext.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_CALLING)) {
		// TelephonyManager.getEmergencyNumberList() throws an exception if
		// FEATURE_TELEPHONY_CALLING is not defined.
		return;
		}
		}

		synchronized (mRecords) {
		if (validatePhoneId(phoneId)) {

+9 −17

Original line number	Diff line number	Diff line
		@@ -2937,28 +2937,20 @@ public class UserManagerService extends IUserManager.Stub {

		int flags = UserManager.SWITCHABILITY_STATUS_OK;

		if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM)) {
		t.traceBegin("TM.isInCall");
		final long identity = Binder.clearCallingIdentity();
		try {
		final TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
		if (com.android.internal.telephony.flags
		.Flags.enforceTelephonyFeatureMappingForPublicApis()) {
		if (mContext.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELECOM)) {
		final TelecomManager telecomManager = mContext.getSystemService(
		TelecomManager.class);
		if (telecomManager != null && telecomManager.isInCall()) {
		flags \|= UserManager.SWITCHABILITY_STATUS_USER_IN_CALL;
		}
		}
		} else {
		if (telecomManager != null && telecomManager.isInCall()) {
		flags \|= UserManager.SWITCHABILITY_STATUS_USER_IN_CALL;
		}
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		t.traceEnd();

		}
		t.traceBegin("hasUserRestriction-DISALLOW_USER_SWITCH");
		if (mLocalService.hasUserRestriction(DISALLOW_USER_SWITCH, userId)) {
		flags \|= UserManager.SWITCHABILITY_STATUS_USER_SWITCH_DISALLOWED;

+2 −7

Original line number	Diff line number	Diff line
		@@ -1737,16 +1737,11 @@ public class EuiccManager {
		private int getCardIdForDefaultEuicc() {
		int cardId = TelephonyManager.UNINITIALIZED_CARD_ID;

		if (Flags.enforceTelephonyFeatureMappingForPublicApis()) {
		PackageManager pm = mContext.getPackageManager();
		if (pm != null && pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC)) {
		TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);
		cardId = tm.getCardIdForDefaultEuicc();
		}
		} else {
		TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);
		cardId = tm.getCardIdForDefaultEuicc();
		}

		return cardId;
		}