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

Commit d6cd6eb7 authored by Roshan Pius's avatar Roshan Pius
Browse files

nfc(api): Remove fg checks from API class 

Instead of checking this in the API class, throw a remote exception from
service when we detect that a non-fg app is trying to enable/disable fg
dispatch. The service is already tracking the app moving to background,
so there is no need for this redundant tracking in the API class.

Bug: 263565738
Test: atest CtsNfcTestCases
Test: CtsVerifier tag tests
Change-Id: Ia04848f6ed2595b33a861427d1d346d0dc9da8a5
parent c79f3cde

core/java/android/nfc/NfcAdapter.java

+0 −25
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.annotation.SdkConstant.SdkConstantType; 
import android.annotation.SystemApi;

import android.annotation.UserIdInt;

import android.app.Activity;

import android.app.ActivityThread;

import android.app.OnActivityPausedListener;

import android.app.PendingIntent;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;
@@ -1570,17 +1568,11 @@ public final class NfcAdapter { 
        if (activity == null || intent == null) {

            throw new NullPointerException();

        }

        if (!activity.isResumed()) {

            throw new IllegalStateException("Foreground dispatch can only be enabled " +

                    "when your activity is resumed");

        }

        try {

            TechListParcel parcel = null;

            if (techLists != null && techLists.length > 0) {

                parcel = new TechListParcel(techLists);

            }

            ActivityThread.currentActivityThread().registerOnActivityPausedListener(activity,

                    mForegroundDispatchListener);

            sService.setForegroundDispatch(intent, filters, parcel);

        } catch (RemoteException e) {

            attemptDeadServiceRecovery(e);
@@ -1608,25 +1600,8 @@ public final class NfcAdapter { 
                throw new UnsupportedOperationException();

            }

        }

        ActivityThread.currentActivityThread().unregisterOnActivityPausedListener(activity,

                mForegroundDispatchListener);

        disableForegroundDispatchInternal(activity, false);

    }



    OnActivityPausedListener mForegroundDispatchListener = new OnActivityPausedListener() {

        @Override

        public void onPaused(Activity activity) {

            disableForegroundDispatchInternal(activity, true);

        }

    };



    void disableForegroundDispatchInternal(Activity activity, boolean force) {

        try {

            sService.setForegroundDispatch(null, null, null);

            if (!force && !activity.isResumed()) {

                throw new IllegalStateException("You must disable foreground dispatching " +

                        "while your activity is still resumed");

            }

        } catch (RemoteException e) {

            attemptDeadServiceRecovery(e);

        }