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

Commit 86833ba4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "remove_isResumed" into main am: efe3eb60 am:... 

Merge changes from topic "remove_isResumed" into main am: efe3eb60 am: c775756c am: 073aba95 am: 40e67ae6 am: 39db6be9

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



Change-Id: I9246712cba4827aafc6a522d3042a01fb1656aa4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b56d352 39db6be9

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) {