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

Commit 5e500806 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android (Google) Code Review
Browse files

Merge "Supress phone number from logcat." into lmp-mr1-dev

parents c029b573 c3765347

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

+2 −2
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ public class SubscriptionController extends ISub.Stub { 
     */

    @Override

    public int setDisplayNumber(String number, int subId) {

        if (DBG) logd("[setDisplayNumber]+ number:" + number + " subId:" + subId);

        if (DBG) logd("[setDisplayNumber]+ subId:" + subId);

        enforceSubscriptionPermission();



        validateSubId(subId);
@@ -883,7 +883,7 @@ public class SubscriptionController extends ISub.Stub { 
        result = mContext.getContentResolver().update(SubscriptionManager.CONTENT_URI, value,

                SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID

                    + "=" + Long.toString(subId), null);

        if (DBG) logd("[setDisplayNumber]- number: " + number + " update result :" + result);

        if (DBG) logd("[setDisplayNumber]- update result :" + result);

        notifySubscriptionInfoChanged();



        return result;

src/java/com/android/internal/telephony/uicc/RuimRecords.java

+0 −1
Original line number Diff line number Diff line
@@ -842,7 +842,6 @@ public final class RuimRecords extends IccRecords { 
            int phoneId = mParentApp.getUiccCard().getPhoneId();

            int[] subIds = SubscriptionController.getInstance().getSubId(phoneId);

            if (subIds != null) {

                log("Calling setDisplayNumber for subId and number " + subIds[0] + " and " + mMdn);

                SubscriptionManager.from(mContext).setDisplayNumber(mMdn, subIds[0]);

            } else {

                log("Cannot call setDisplayNumber: invalid subId");