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

Commit 16c825c6 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "SMS handlers: use FEATURE_TELEPHONY_* instead of config_*_capable" into main

parents 439d5e35 c6d50061

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/SMSDispatcher.java

+1 −2
Original line number Diff line number Diff line
@@ -255,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();