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

Commit 7bd482ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check the sending permission of TTY_PREFERRED_MODE_CHANGED" into... 

Merge "Check the sending permission of TTY_PREFERRED_MODE_CHANGED" into sc-v2-dev am: 74029465 am: aea54e5f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/16080095

Change-Id: Iac6f6e95ad6736a480d18943ec08fe284af81464
parents f1189561 aea54e5f

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

+2 −1
Original line number Diff line number Diff line
@@ -452,7 +452,8 @@ public class GsmCdmaPhone extends Phone { 
                CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        filter.addAction(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED);

        filter.addAction(TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED);

        mContext.registerReceiver(mBroadcastReceiver, filter);

        mContext.registerReceiver(mBroadcastReceiver, filter,

                android.Manifest.permission.MODIFY_PHONE_STATE, null);



        mCDM = new CarrierKeyDownloadManager(this);

        mCIM = new CarrierInfoManager();