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

Commit 3fff9dfa authored by Varun Berry's avatar Varun Berry Committed by Android Build Coastguard Worker
Browse files

Use an explicit intent to start VoicemailChangePinActivityPeer. 

This fixes an issue where the CHANGE_PIN intent can be intercepted.

Bug: 186405602
Test: manual.
Merged-In: If31e733c4f94fa4d0793a7538ec76a10752329b6
Change-Id: I0ec5921f2723430d16d6f101ba0ad351ab0cf73c
(cherry picked from commit 02e1666d)
Merged-In:I0ec5921f2723430d16d6f101ba0ad351ab0cf73c
parent 57af8cad

java/com/android/dialer/voicemail/listui/error/VoicemailErrorMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public class VoicemailErrorMessage { 
          public void onClick(View v) {

            Logger.get(context)

                .logImpression(DialerImpression.Type.VOICEMAIL_ALERT_SET_PIN_CLICKED);

            Intent intent = new Intent(VoicemailChangePinActivity.ACTION_CHANGE_PIN);

            Intent intent = new Intent(context, VoicemailChangePinActivity.class);

            intent.putExtra(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);

            context.startActivity(intent);

          }

java/com/android/dialer/voicemail/settings/AndroidManifest.xml

+0 −4
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ 
        android:parentActivityName="com.android.dialer.app.settings.DialerSettingsActivity"

        android:theme="@style/SettingsStyle"

        android:windowSoftInputMode="stateVisible|adjustResize">

      <intent-filter>

        <action android:name="com.android.dialer.action.CHANGE_PIN"/>

        <category android:name="android.intent.category.DEFAULT"/>

      </intent-filter>

    </activity>

    <activity

        android:name=".RecordVoicemailGreetingActivity"

java/com/android/dialer/voicemail/settings/VoicemailChangePinActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public class VoicemailChangePinActivity extends Activity 
    implements OnClickListener, OnEditorActionListener, TextWatcher {



  private static final String TAG = "VmChangePinActivity";

  public static final String ACTION_CHANGE_PIN = "com.android.dialer.action.CHANGE_PIN";



  private static final int MESSAGE_HANDLE_RESULT = 1;