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

Commit 9ddd8750 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Unexpected state change for Other category service" into main am: fccb9233 am: dd8c007c 

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



Change-Id: Ibb5a9cbe5466de2714647cd485e328936b8ed60b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e61c6903 dd8c007c

core/java/android/nfc/cardemulation/ApduServiceInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 
package android.nfc.cardemulation;



import android.annotation.FlaggedApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;
@@ -374,7 +374,7 @@ public final class ApduServiceInfo implements Parcelable { 
        // Set uid

        mUid = si.applicationInfo.uid;



        mCategoryOtherServiceEnabled = false;    // support other category

        mCategoryOtherServiceEnabled = true;    // support other category



    }