Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67bfd021 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the flag enforce_telephony_feature_mapping" into main

parents 824cd1cc 6a91d139

services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java

+12 −20
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.telephony.TelephonyManager; 
import android.util.Log;



import com.android.internal.telephony.TelephonyIntents;

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

import com.android.server.FgThread;



import java.util.Objects;
@@ -107,12 +106,6 @@ public class SystemEmergencyHelper extends EmergencyHelper { 
        boolean isInExtensionTime = mEmergencyCallEndRealtimeMs != Long.MIN_VALUE

                && (SystemClock.elapsedRealtime() - mEmergencyCallEndRealtimeMs) < extensionTimeMs;



        if (!Flags.enforceTelephonyFeatureMapping()) {

            return mIsInEmergencyCall

                    || isInExtensionTime

                    || mTelephonyManager.getEmergencyCallbackMode()

                    || mTelephonyManager.isInEmergencySmsMode();

        } else {

        boolean emergencyCallbackMode = false;

        boolean emergencySmsMode = false;

        PackageManager pm = mContext.getPackageManager();
@@ -127,7 +120,6 @@ public class SystemEmergencyHelper extends EmergencyHelper { 
                || emergencyCallbackMode

                || emergencySmsMode;

    }

    }



    private class EmergencyCallTelephonyCallback extends TelephonyCallback implements

            TelephonyCallback.CallStateListener{

services/voiceinteraction/java/com/android/server/soundtrigger/PhoneCallStateHandler.java

+12 −23
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.telephony.TelephonyManager; 
import android.util.Slog;



import com.android.internal.annotations.GuardedBy;

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



import java.util.ArrayList;

import java.util.List;
@@ -119,15 +118,6 @@ public class PhoneCallStateHandler { 
    private boolean checkCallStatus() {

        List<SubscriptionInfo> infoList = mSubscriptionManager.getActiveSubscriptionInfoList();

        if (infoList == null) return false;

        if (!Flags.enforceTelephonyFeatureMapping()) {

            return infoList.stream()

                    .filter(s -> (s.getSubscriptionId()

                            != SubscriptionManager.INVALID_SUBSCRIPTION_ID))

                    .anyMatch(s -> isCallOngoingFromState(

                            mTelephonyManager

                                    .createForSubscriptionId(s.getSubscriptionId())

                                    .getCallStateForSubscription()));

        } else {

        return infoList.stream()

                .filter(s -> (s.getSubscriptionId()

                        != SubscriptionManager.INVALID_SUBSCRIPTION_ID))
@@ -141,7 +131,6 @@ public class PhoneCallStateHandler { 
                    }

                });

    }

    }



    private void updateTelephonyListeners() {

        synchronized (mLock) {