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

Commit efe3eb60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "remove_isResumed" into main 

* changes:
  nfc(api): Remove isResumed checks from API class
  Revert^2 "nfc(api): Remove fg checks from API class"
parents 0d801d9e 7bf3becc

core/java/android/nfc/cardemulation/CardEmulation.java

+0 −6
Original line number Diff line number Diff line
@@ -594,9 +594,6 @@ public final class CardEmulation { 
        if (activity == null || service == null) {

            throw new NullPointerException("activity or service or category is null");

        }

        if (!activity.isResumed()) {

            throw new IllegalArgumentException("Activity must be resumed.");

        }

        try {

            return sService.setPreferredService(service);

        } catch (RemoteException e) {
@@ -629,9 +626,6 @@ public final class CardEmulation { 
        if (activity == null) {

            throw new NullPointerException("activity is null");

        }

        if (!activity.isResumed()) {

            throw new IllegalArgumentException("Activity must be resumed.");

        }

        try {

            return sService.unsetPreferredService();

        } catch (RemoteException e) {