summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2024-05-09 00:32:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-09 00:32:03 +0000
commit43420b33e466e530d403c0bbd582edad583f6e8e (patch)
treeec4dcfccdc8227f489e6dfa45864d6f542c6b0af
parentcf7ae3023106966e6851581b0cd4854b9b1fd34d (diff)
parenta087ec32bda61ec50b4af89bf53a3bc845981477 (diff)
downloadbase-43420b33e466e530d403c0bbd582edad583f6e8e.tar.gz
Merge "nfc(api): Add user id in setServiceEnabledForCategoryOther" into main
-rw-r--r--nfc/java/android/nfc/cardemulation/CardEmulation.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/nfc/java/android/nfc/cardemulation/CardEmulation.java b/nfc/java/android/nfc/cardemulation/CardEmulation.java
index ad86d70db967..4bae1188e0df 100644
--- a/nfc/java/android/nfc/cardemulation/CardEmulation.java
+++ b/nfc/java/android/nfc/cardemulation/CardEmulation.java
@@ -970,16 +970,16 @@ public final class CardEmulation {
*
* @param service The ComponentName of the service
* @param status true to enable, false to disable
+ * @param userId the user handle of the user whose information is being requested.
* @return set service for the category and true if service is already set return false.
*
* @hide
*/
- public boolean setServiceEnabledForCategoryOther(ComponentName service, boolean status) {
+ public boolean setServiceEnabledForCategoryOther(ComponentName service, boolean status,
+ int userId) {
if (service == null) {
throw new NullPointerException("activity or service or category is null");
}
- int userId = mContext.getUser().getIdentifier();
-
try {
return sService.setServiceEnabledForCategoryOther(userId, service, status);
} catch (RemoteException e) {