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

Commit 85e9b941 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Properly handle a null URI." into cm-11.0

parents d6127d03 6adc7fa6

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

+2 −2
Original line number Diff line number Diff line
@@ -231,10 +231,10 @@ public class SmsUsageMonitor { 


        @Override

        public void onChange(boolean selfChange, Uri uri) {

            if (uri.equals(Settings.Global.getUriFor(Settings.Global.SMS_SHORT_CODE_CONFIRMATION))) {

            if (Settings.Global.getUriFor(Settings.Global.SMS_SHORT_CODE_CONFIRMATION).equals(uri)) {

                mCheckEnabled.set(Settings.Global.getInt(mContext.getContentResolver(),

                        Settings.Global.SMS_SHORT_CODE_CONFIRMATION, 1) != 0);

            } else if (uri.equals(Settings.Global.getUriFor(Settings.Global.SMS_OUTGOING_CHECK_MAX_COUNT))) {

            } else if (Settings.Global.getUriFor(Settings.Global.SMS_OUTGOING_CHECK_MAX_COUNT).equals(uri)) {

                mMaxAllowed = Settings.Global.getInt(mContext.getContentResolver(),

                        Settings.Global.SMS_OUTGOING_CHECK_MAX_COUNT, DEFAULT_SMS_MAX_COUNT);

            }