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

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

Snap for 12327203 from 16c825c6 to 24Q4-release 

Change-Id: I008e9c3eefede646ccba00d34e40a31a72d2cdf3
parents 91d98150 16c825c6

flags/misc.aconfig

+0 −22
Original line number Diff line number Diff line
@@ -118,17 +118,6 @@ flag { 
    }

}



# OWNER=rambowang TARGET=24Q3

flag {

    name: "hide_preinstalled_carrier_app_at_most_once"

    namespace: "telephony"

    description: "Fix bug when preloaded carrier app is uninstalled and lose provisioning data"

    bug:"158028151"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=sangyun TARGET=24Q3

flag {

    name: "roaming_notification_for_single_data_network"
@@ -218,17 +207,6 @@ flag { 
    }

}



# OWNER=rambowang TARGET=24Q4

flag {

    name: "support_phone_uid_check_for_multiuser"

    namespace: "telephony"

    description: "Check phone/system processes from UID with multiuser-aware way"

    bug:"328511085"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=joonhunshin TARGET=24Q4

flag {

    name: "use_carrier_config_for_cfnry_time_via_mmi"

flags/uicc.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ flag { 
    bug:"318348580"

}



# OWNER=rambowang TARGET=24Q3

flag {

    name: "cleanup_open_logical_channel_record_on_dispose"

    namespace: "telephony"

    description: "This flag cleans up the OpenLogicalChannelRecord once SIM is removed"

    bug:"335046531"

}



# OWNER=arunvoddu TARGET=24Q4

flag {

    name: "set_carrier_restriction_status"

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

+3 −3
Original line number Diff line number Diff line
@@ -305,9 +305,9 @@ public abstract class InboundSmsHandler extends StateMachine { 
        mResolver = context.getContentResolver();

        mWapPush = new WapPushOverSms(context, mFeatureFlags);



        boolean smsCapable = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_sms_capable);

        mSmsReceiveDisabled = !TelephonyManager.from(mContext).getSmsReceiveCapableForPhone(

        TelephonyManager telephonyManager = TelephonyManager.from(mContext);

        boolean smsCapable = telephonyManager.isDeviceSmsCapable();

        mSmsReceiveDisabled = !telephonyManager.getSmsReceiveCapableForPhone(

                mPhone.getPhoneId(), smsCapable);



        PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

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

+2 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.content.ServiceConnection; 
import android.os.IBinder;

import android.os.UserHandle;



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

import com.android.telephony.Rlog;



/** This class provides wrapper APIs for binding interfaces to mock service. */
@@ -161,12 +160,8 @@ public class MockModem { 
        intent.setAction(actionName + phoneId);

        intent.putExtra(PHONE_ID, phoneId);



        if (Flags.supportPhoneUidCheckForMultiuser()) {

        status = mContext.bindServiceAsUser(intent, serviceConnection, Context.BIND_AUTO_CREATE,

                UserHandle.of(ActivityManager.getCurrentUser()));

        } else {

            status = mContext.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);

        }

        return status;

    }

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

+1 −21
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.Message;

import android.os.PersistableBundle;

import android.os.Process;

import android.os.SystemClock;

import android.os.UserHandle;

import android.provider.Settings;
@@ -256,8 +255,7 @@ public abstract class SMSDispatcher extends Handler { 
        mContext.getContentResolver().registerContentObserver(Settings.Global.getUriFor(

                Settings.Global.SMS_SHORT_CODE_RULE), false, mSettingsObserver);



        mSmsCapable = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_sms_capable);

        mSmsCapable = mTelephonyManager.isDeviceSmsCapable();

        mSmsSendDisabled = !mTelephonyManager.getSmsSendCapableForPhone(

                mPhone.getPhoneId(), mSmsCapable);

        IntentFilter intentFilter = new IntentFilter();
@@ -3039,24 +3037,6 @@ public abstract class SMSDispatcher extends Handler { 
        return SubscriptionManager.getSubscriptionId(mPhone.getPhoneId());

    }



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private void checkCallerIsPhoneOrCarrierApp() {

        int uid = Binder.getCallingUid();

        int appId = UserHandle.getAppId(uid);

        if (appId == Process.PHONE_UID || uid == 0) {

            return;

        }

        try {

            PackageManager pm = mContext.getPackageManager();

            ApplicationInfo ai = pm.getApplicationInfo(getCarrierAppPackageName(), 0);

            if (UserHandle.getAppId(ai.uid) != UserHandle.getAppId(Binder.getCallingUid())) {

                throw new SecurityException("Caller is not phone or carrier app!");

            }

        } catch (PackageManager.NameNotFoundException re) {

            throw new SecurityException("Caller is not phone or carrier app!");

        }

    }



    protected boolean isCdmaMo() {

        return mSmsDispatchersController.isCdmaMo();

    }