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

Commit 1fe06dda authored by sqian's avatar sqian Committed by Shuo Qian
Browse files

Fix some small flaws in Call Redirection service 

1) Non-null the post dial portion
2) Fix some documentation
3) Fix some log

Test: manual
Bug: 130026756
Change-Id: I3e44eb941faf12124d1ae2db25d66e0de48d6478
Merged-In: I3e44eb941faf12124d1ae2db25d66e0de48d6478
(cherry picked from commit 79732b61)
parent 159f6b7a

src/com/android/server/telecom/callredirection/CallRedirectionProcessorHelper.java

+6 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class CallRedirectionProcessorHelper { 
    private final Context mContext;

    private final CallsManager mCallsManager;

    private final PhoneAccountRegistrar mPhoneAccountRegistrar;

    private String mOriginalPostDialDigits = null;

    private String mOriginalPostDialDigits = "";



    public CallRedirectionProcessorHelper(

            Context context,
@@ -62,7 +62,7 @@ public class CallRedirectionProcessorHelper { 
        }

        Intent intent = new Intent(CallRedirectionService.SERVICE_INTERFACE)

                .setPackage(packageName);

        return getComponentName(intent, CallRedirectionProcessor.SERVICE_TYPE_CARRIER);

        return getComponentName(intent, CallRedirectionProcessor.SERVICE_TYPE_USER_DEFINED);

    }



    @VisibleForTesting
@@ -136,7 +136,10 @@ public class CallRedirectionProcessorHelper { 


    protected void storePostDialDigits(Uri handle) {

        String number = handle.getSchemeSpecificPart();

        mOriginalPostDialDigits += PhoneNumberUtils.extractPostDialPortion(number);

        String postDialPortion = PhoneNumberUtils.extractPostDialPortion(number);

        if (postDialPortion != null) {

            mOriginalPostDialDigits = postDialPortion;

        }

        Log.i(this, "storePostDialDigits, stored post dial digits: "

                + Log.pii(mOriginalPostDialDigits));

    }