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

Merge "nfc: Migrate away from @hide getIntForUser" am: 31b73ad4b9

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

Change-Id: I07cdb5217e1f505e56da043e5ef6195cdd4f981f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-10 23:23:36 +00:00
committed by Automerger Merge Worker
parent 9ac35bd34d 31b73ad4b9
commit f295ce113b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,12 +265,16 @@ public final class CardEmulation {
* @return whether AIDs in the category can be handled by a service
* specified by the foreground app.
*/
@SuppressWarnings("NonUserGetterCalled")
public boolean categoryAllowsForegroundPreference(String category) {
if (CATEGORY_PAYMENT.equals(category)) {
boolean preferForeground = false;
Context contextAsUser = mContext.createContextAsUser(
UserHandle.of(UserHandle.myUserId()), 0);
try {
preferForeground = Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_FOREGROUND, UserHandle.myUserId()) != 0;
preferForeground = Settings.Secure.getInt(
contextAsUser.getContentResolver(),
Settings.Secure.NFC_PAYMENT_FOREGROUND) != 0;
} catch (SettingNotFoundException e) {
}
return preferForeground;