summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Prevot <nprevot@google.com> 2015-07-02 12:28:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-07-02 12:28:46 +0000
commit2ee3beedb1f6702f4c94eff24c896cd4a894082b (patch)
tree9237f966c1579da386be1b476e3a8339aa6d42cd
parent60373e8060cf6de2d293a758c33cc5f610122657 (diff)
parent81b7b10864c1b8ba4c7d002a77bdedf613bfaf40 (diff)
Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev
-rw-r--r--core/java/android/nfc/NfcActivityManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/nfc/NfcActivityManager.java b/core/java/android/nfc/NfcActivityManager.java
index 76bd0ece384a..d619c0a8e117 100644
--- a/core/java/android/nfc/NfcActivityManager.java
+++ b/core/java/android/nfc/NfcActivityManager.java
@@ -406,7 +406,7 @@ public final class NfcActivityManager extends IAppCallback.Stub
Intent.FLAG_GRANT_READ_URI_PERMISSION);
}
}
- return new BeamShareData(message, uris, UserHandle.CURRENT, flags);
+ return new BeamShareData(message, uris, new UserHandle(UserHandle.myUserId()), flags);
}
/** Callback from NFC service, usually on binder thread */