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

Commit 62062413 authored by Taesu Lee's avatar Taesu Lee Committed by android-build-merger
Browse files

Merge "Fix a mistake caused by rebasing" am: 5dcca67d 

am: c87dfad3

Change-Id: I80237081a7f1ecf34934716cd00002008e44a4ed
parents 8583432b c87dfad3

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

+3 −3
Original line number Diff line number Diff line
@@ -551,9 +551,6 @@ public class SmsController extends ISmsImplBase { 
        }

    }



    /**

     * Triggered by `adb shell dumpsys isms`

     */

    @Override

    public String getSmscAddressFromIccEfForSubscriber(int subId, String callingPackage) {

        IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
@@ -579,6 +576,9 @@ public class SmsController extends ISmsImplBase { 
        }

    }



    /**

     * Triggered by `adb shell dumpsys isms`

     */

    @Override

    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        if (!checkDumpPermission(mContext, LOG_TAG, pw)) {