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

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

Snap for 13412669 from 49cef7dc to 25Q3-release 

Change-Id: Iafc81c8b7858aa057e912ce3d91d1f5d1f23c34e
parents 7972e038 49cef7dc

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_broadcast"

    namespace: "telephony"

    description: "Fixed the bug that broadcast intent is only sent to the system user."

    bug:"362554272"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=rambowang TARGET=25Q2

flag {

    name: "support_carrier_services_for_hsum"

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

+2 −10
Original line number Diff line number Diff line
@@ -506,11 +506,7 @@ public class CarrierResolver extends Handler { 
            intent.putExtra(TelephonyManager.EXTRA_SPECIFIC_CARRIER_ID, mSpecificCarrierId);

            intent.putExtra(TelephonyManager.EXTRA_SPECIFIC_CARRIER_NAME, mSpecificCarrierName);

            intent.putExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID, mPhone.getSubId());

            if (mFeatureFlags.hsumBroadcast()) {

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

            } else {

                mContext.sendBroadcast(intent);

            }



            // notify content observers for specific carrier id change event.

            ContentValues cv = new ContentValues();
@@ -545,11 +541,7 @@ public class CarrierResolver extends Handler { 
            intent.putExtra(TelephonyManager.EXTRA_CARRIER_ID, mCarrierId);

            intent.putExtra(TelephonyManager.EXTRA_CARRIER_NAME, mCarrierName);

            intent.putExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID, mPhone.getSubId());

            if (mFeatureFlags.hsumBroadcast()) {

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

            } else {

                mContext.sendBroadcast(intent);

            }



            // notify content observers for carrier id change event

            ContentValues cv = new ContentValues();

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

+2 −6
Original line number Diff line number Diff line
@@ -832,12 +832,8 @@ public abstract class InboundSmsHandler extends StateMachine { 
            Intent intent = new Intent(Intents.SMS_REJECTED_ACTION);

            intent.putExtra("result", result);

            intent.putExtra("subId", mPhone.getSubId());

            if (mFeatureFlags.hsumBroadcast()) {

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL,

                    android.Manifest.permission.RECEIVE_SMS);

            } else {

                mContext.sendBroadcast(intent, android.Manifest.permission.RECEIVE_SMS);

            }

        }

        acknowledgeLastIncomingSms(success, result, response);

    }

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

+2 −10
Original line number Diff line number Diff line
@@ -790,11 +790,7 @@ public class MultiSimSettingController extends Handler { 
        intent.putExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE, type);

        intent.putExtra(EXTRA_SUBSCRIPTION_ID, defaultSubId);



        if (mFeatureFlags.hsumBroadcast()) {

        mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

        } else {

            mContext.sendBroadcast(intent);

        }

    }



    private void sendSubChangeNotificationIfNeeded(int change, boolean dataSelected,
@@ -832,11 +828,7 @@ public class MultiSimSettingController extends Handler { 
            if (simCombinationParams.mWarningType == EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA) {

                intent.putExtra(EXTRA_SIM_COMBINATION_NAMES, simCombinationParams.mSimNames);

            }

            if (mFeatureFlags.hsumBroadcast()) {

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

            } else {

                mContext.sendBroadcast(intent);

            }

        }

    }

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

+3 −11
Original line number Diff line number Diff line
@@ -3200,11 +3200,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            Intent intent = new Intent(TelephonyIntents.SECRET_CODE_ACTION,

                    Uri.parse("android_secret_code://" + code));

            intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            if (mFeatureFlags.hsumBroadcast()) {

            mContext.sendBroadcastAsUser(intent, UserHandle.ALL, null, options.toBundle());

            } else {

                mContext.sendBroadcast(intent, null, options.toBundle());

            }



            // {@link TelephonyManager.ACTION_SECRET_CODE} will replace {@link

            // TelephonyIntents#SECRET_CODE_ACTION} in the next Android version. Before
@@ -3212,12 +3208,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            Intent secrectCodeIntent = new Intent(TelephonyManager.ACTION_SECRET_CODE,

                    Uri.parse("android_secret_code://" + code));

            secrectCodeIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            if (mFeatureFlags.hsumBroadcast()) {

            mContext.sendBroadcastAsUser(secrectCodeIntent, UserHandle.ALL, null,

                    options.toBundle());

            } else {

                mContext.sendBroadcast(secrectCodeIntent, null, options.toBundle());

            }

        }

    }