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

Commit e5b37ef0 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Revert "Reroute contactless payment fragments to nfc settings when" 

This reverts commit c6eef3a1.

Reason for revert: Likely culprit for b/327263772. Will be verifying through ABTD for confirmation and before submitting the revert.

Change-Id: I7ebc2021835a0c388ed7e82880d19da194f13ad2
parent c6eef3a1

src/com/android/settings/SettingsActivity.java

+0 −18
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.os.AsyncTask; 
import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.permission.flags.Flags;

import android.text.TextUtils;

import android.util.Log;

import android.view.View;
@@ -829,29 +828,12 @@ public class SettingsActivity extends SettingsBaseActivity 
            if (ai == null || ai.metaData == null) return;

            mFragmentClass = ai.metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);

            mHighlightMenuKey = ai.metaData.getString(META_DATA_KEY_HIGHLIGHT_MENU_KEY);

            /* TODO(b/327036144) Once the Flags.walletRoleEnabled() is rolled out, we will replace

            value for the fragment class within the com.android.settings.nfc.PaymentSettings

            activity with com.android.settings.connecteddevice.NfcAndPaymentFragment so that this

            code can be removed.

            */

            if (shouldOverrideContactlessPaymentRouting()) {

                overrideContactlessPaymentRouting();

            }

        } catch (NameNotFoundException nnfe) {

            // No recovery

            Log.d(LOG_TAG, "Cannot get Metadata for: " + getComponentName().toString());

        }

    }



    private boolean shouldOverrideContactlessPaymentRouting() {

        return Flags.walletRoleEnabled()

                && mFragmentClass.equals("com.android.settings.nfc.PaymentSettings");

    }



    private void overrideContactlessPaymentRouting() {

        mFragmentClass = "com.android.settings.connecteddevice.NfcAndPaymentFragment";

    }



    // give subclasses access to the Next button

    public boolean hasNextButton() {

        return mNextButton != null;