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

Commit 2d54ca65 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "nfc(api): Remove fg checks from API class"" am: ce749aa5 am: 547e0657 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2644831



Change-Id: I95f129a98419b0e1326047354a11b3a3f77ca9bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41868cb6 547e0657

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;
@@ -1472,17 +1470,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);
@@ -1510,25 +1502,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);

        }