PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct null UserHandle handling for ACTION_CHANGE_DEFAULT" into tm-dev am: 0469e3b5ba

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17180788

Change-Id: I2ac9a3f48928cb00f8a0674d489d2b5fd4eabc86
This commit is contained in:
TreeHugger Robot
2022-03-15 03:15:21 +00:00
committed by Automerger Merge Worker
parent a1ec33b820 0469e3b5ba
commit 45bd29c8c5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/nfc/PaymentDefaultDialog.java
View File

@@ -59,10 +59,13 @@ public final class PaymentDefaultDialog extends AlertActivity implements
CardEmulation.EXTRA_SERVICE_COMPONENT); CardEmulation.EXTRA_SERVICE_COMPONENT);
String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY); String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY);
UserHandle userHandle = intent.getParcelableExtra(Intent.EXTRA_USER); UserHandle userHandle = intent.getParcelableExtra(Intent.EXTRA_USER);
int userId;
if (userHandle == null) { if (userHandle == null) {
userHandle = UserHandle.CURRENT; userId = UserHandle.myUserId();
} else {
userId = userHandle.getIdentifier();
} }
int userId = userHandle.getIdentifier();
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);
if (!buildDialog(component, category, userId)) { if (!buildDialog(component, category, userId)) {