diff options
author | Nicolas Prevot <nprevot@google.com> | 2015-07-04 08:06:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-04 08:06:56 +0000 |
commit | a8123ffa488a8f3d3eaab5a28cacb047b986cb70 (patch) | |
tree | e33c2409be3cae0afd5f8a834118491ec67f2b3b /src/com/android/nfc | |
parent | 66ff1556ee8f3b002d5d1159096ada043385d9c2 (diff) | |
parent | 5f1bdb42fa8d47e1f7c3e3af26339cef81049069 (diff) | |
download | android_packages_apps_Nfc-a8123ffa488a8f3d3eaab5a28cacb047b986cb70.tar.gz android_packages_apps_Nfc-a8123ffa488a8f3d3eaab5a28cacb047b986cb70.tar.bz2 android_packages_apps_Nfc-a8123ffa488a8f3d3eaab5a28cacb047b986cb70.zip |
am 5f1bdb42: am f4c79932: am a7f7ebfa: In BeamShareActivity, don\'t use UserHandle.CURRENT.
* commit '5f1bdb42fa8d47e1f7c3e3af26339cef81049069':
In BeamShareActivity, don't use UserHandle.CURRENT.
Diffstat (limited to 'src/com/android/nfc')
-rw-r--r-- | src/com/android/nfc/BeamShareActivity.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/nfc/BeamShareActivity.java b/src/com/android/nfc/BeamShareActivity.java index 10f6632c..cff601cf 100644 --- a/src/com/android/nfc/BeamShareActivity.java +++ b/src/com/android/nfc/BeamShareActivity.java @@ -189,6 +189,7 @@ public class BeamShareActivity extends Activity { } BeamShareData shareData = null; + UserHandle myUserHandle = new UserHandle(UserHandle.myUserId()); if (mUris.size() > 0) { // Uris have our first preference for sharing Uri[] uriArray = new Uri[mUris.size()]; @@ -205,18 +206,18 @@ public class BeamShareActivity extends Activity { } } if (numValidUris > 0) { - shareData = new BeamShareData(null, uriArray, UserHandle.CURRENT, 0); + shareData = new BeamShareData(null, uriArray, myUserHandle, 0); } else { // No uris left - shareData = new BeamShareData(null, null, UserHandle.CURRENT, 0); + shareData = new BeamShareData(null, null, myUserHandle, 0); } } else if (mNdefMessage != null) { - shareData = new BeamShareData(mNdefMessage, null, UserHandle.CURRENT, 0); + shareData = new BeamShareData(mNdefMessage, null, myUserHandle, 0); if (DBG) Log.d(TAG, "Created NDEF message:" + mNdefMessage.toString()); } else { if (DBG) Log.d(TAG, "Could not find any data to parse."); // Activity may have set something to share over NFC, so pass on anyway - shareData = new BeamShareData(null, null, UserHandle.CURRENT, 0); + shareData = new BeamShareData(null, null, myUserHandle, 0); } mNfcAdapter.invokeBeam(shareData); finish(); |