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

Commit 7f244f37 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13436862 from f65c1e01 to 25Q3-release 

Change-Id: I288bcf138fe2ec55c54d13ac2e0a71d48d370155
parents 2ba8c139 f65c1e01

flags/misc.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -101,17 +101,6 @@ flag { 
    }

}



# OWNER=jackyu TARGET=25Q2

flag {

    name: "hsum_package_manager"

    namespace: "telephony"

    description: "Fixed the bug that package manager is not for the right user"

    bug:"356827794"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=jackyu TARGET=25Q2

flag {

    name: "power_down_race_fix"

flags/network.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -37,17 +37,6 @@ flag { 
  bug: "355062720"

}



# OWNER=jackyu TARGET=25Q3

flag {

    name: "ignore_mcc_mnc_from_operator_for_locale"

    namespace: "telephony"

    description: "Ignoring mcc/mnc from RIL indication OPERATOR but only relying MCC/MNC from registered or nearby cells."

    bug:"374589521"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=yomna TARGET=25Q4

flag {

    name: "vendor_specific_cellular_identifier_disclosure_indications"

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

+1 −4
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ import com.android.internal.telephony.SmsConstants.MessageClass; 
import com.android.internal.telephony.analytics.TelephonyAnalytics;

import com.android.internal.telephony.analytics.TelephonyAnalytics.SmsMmsAnalytics;

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

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

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.satellite.SatelliteController;

import com.android.internal.telephony.satellite.metrics.CarrierRoamingSatelliteSessionStats;
@@ -2192,9 +2191,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                UserManager userManager =

                        (UserManager) context.getSystemService(Context.USER_SERVICE);

                PackageManager pm = context.getPackageManager();

                if (Flags.hsumPackageManager()) {

                pm = context.createContextAsUser(UserHandle.CURRENT, 0).getPackageManager();

                }

                if (userManager.isUserUnlocked()) {

                    context.startActivityAsUser(pm.getLaunchIntentForPackage(

                            Telephony.Sms.getDefaultSmsPackage(context)), UserHandle.CURRENT);

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

+4 −9
Original line number Diff line number Diff line
@@ -838,17 +838,12 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
     */

    @Nullable

    private String getCurrentPackageName() {

        if (mFeatureFlags.hsumPackageManager()) {

        PackageManager pm = mContext.createContextAsUser(Binder.getCallingUserHandle(), 0)

                .getPackageManager();

        if (pm == null) return null;

        String[] callingPackageNames = pm.getPackagesForUid(Binder.getCallingUid());

        return (callingPackageNames == null) ? null : callingPackageNames[0];

    }

        if (mPackageManager == null) return null;

        String[] callingPackageNames = mPackageManager.getPackagesForUid(Binder.getCallingUid());

        return (callingPackageNames == null) ? null : callingPackageNames[0];

    }



    /**

     * Make sure the device has required telephony feature

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

+0 −20
Original line number Diff line number Diff line
@@ -3888,26 +3888,6 @@ public class ServiceStateTracker extends Handler { 
            tm.setNetworkOperatorNumericForPhone(mPhone.getPhoneId(), operatorNumeric);



            String localeOperator = null;

            if (!mFeatureFlags.ignoreMccMncFromOperatorForLocale()) {

                // If the OPERATOR command hasn't returned a valid operator or the device is on

                // IWLAN (because operatorNumeric would be SIM's mcc/mnc when device is on IWLAN),

                // but if the device has camped on a cell either to attempt registration or for

                // emergency services, then for purposes of setting the locale, we don't care if

                // registration fails or is incomplete. Additionally, if there is no cellular

                // service and ims is registered over the IWLAN, the locale will not be updated.

                // CellIdentity can return a null MCC and MNC in CDMA

                localeOperator = operatorNumeric;

                int dataNetworkType = mSS.getDataNetworkType();

                if (dataNetworkType == TelephonyManager.NETWORK_TYPE_IWLAN

                        || (dataNetworkType == TelephonyManager.NETWORK_TYPE_UNKNOWN

                        && getImsRegistrationTech()

                        == ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN)) {

                    // TODO(b/333346537#comment10): Complete solution would be ignore mcc/mnc

                    //  reported by the unsolicited indication OPERATOR from RIL, but only relies on

                    //  MCC/MNC from data registration or voice registration.

                    localeOperator = null;

                }

            }

            if (isInvalidOperatorNumeric(localeOperator)) {

                for (CellIdentity cid : prioritizedCids) {

                    if (!TextUtils.isEmpty(cid.getPlmn())) {