In BeamShareActivity, don't use UserHandle.CURRENT.

In the work profile, UserHandle.CURRENT refers to the primary user.
We want to refer to the work profile itself.
So, using new UserHandle(UserHandle.myUserId()) instead.

BUG:21960385
Change-Id: I2b29b4d862daae58f666024e9f538cea1dbe39a3

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();