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

Commit c7a2659e authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

Merge "nfc(api): Add user id in setServiceEnabledForCategoryOther" into main... 

Merge "nfc(api): Add user id in setServiceEnabledForCategoryOther" into main am: 43420b33 am: 399c2a51

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



Change-Id: Ia870287287d0b2ff32512c4f9329ad225bf93403
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f57959d 399c2a51

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

+3 −3
Original line number Diff line number Diff line
@@ -1212,16 +1212,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) {