Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "remove_isResumed" into main am: efe3eb602b

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

Change-Id: I54678c8e538e6c9e7fe86406379a1512cb09bff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-12 20:21:05 +00:00
committed by Automerger Merge Worker
parent d52a4ea679 efe3eb602b
commit c775756c1b
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/nfc/cardemulation/CardEmulation.java
View File

@@ -594,9 +594,6 @@ public final class CardEmulation {
if (activity == null || service == null) { if (activity == null || service == null) {
throw new NullPointerException("activity or service or category is null"); throw new NullPointerException("activity or service or category is null");
} }
if (!activity.isResumed()) {
throw new IllegalArgumentException("Activity must be resumed.");
}
try { try {
return sService.setPreferredService(service); return sService.setPreferredService(service);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -629,9 +626,6 @@ public final class CardEmulation {
if (activity == null) { if (activity == null) {
throw new NullPointerException("activity is null"); throw new NullPointerException("activity is null");
} }
if (!activity.isResumed()) {
throw new IllegalArgumentException("Activity must be resumed.");
}
try { try {
return sService.unsetPreferredService(); return sService.unsetPreferredService();
} catch (RemoteException e) { } catch (RemoteException e) {