diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 22:49:42 -0800 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-21 21:08:23 +0000 |
| commit | 6a645b3241be2ba27b2b38f0cd68ad7e6fafafa5 (patch) | |
| tree | 4db310cf6ff3ab0dbb5407ffa13235b1d834be3a /src/com/android/nfc/NfcRootActivity.java | |
| parent | 3d402b5b2bd83007c5bffa4d40977e3314da4a91 (diff) | |
| parent | eba57c26732d3313befb574af85770452d841b87 (diff) | |
| download | packages_apps_nfc-6a645b3241be2ba27b2b38f0cd68ad7e6fafafa5.zip packages_apps_nfc-6a645b3241be2ba27b2b38f0cd68ad7e6fafafa5.tar.gz packages_apps_nfc-6a645b3241be2ba27b2b38f0cd68ad7e6fafafa5.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into HEAD
Conflicts:
nxp/jni/com_android_nfc_NativeNfcManager.cpp
Change-Id: Ic84af6ad1cda79984f40e9fc464d2cbaa994b89a
Diffstat (limited to 'src/com/android/nfc/NfcRootActivity.java')
| -rw-r--r-- | src/com/android/nfc/NfcRootActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/nfc/NfcRootActivity.java b/src/com/android/nfc/NfcRootActivity.java index 1325ead..cc216f2 100644 --- a/src/com/android/nfc/NfcRootActivity.java +++ b/src/com/android/nfc/NfcRootActivity.java @@ -17,9 +17,11 @@ package com.android.nfc; import android.app.Activity; +import android.app.ActivityManager; import android.content.ActivityNotFoundException; import android.content.Intent; import android.os.Bundle; +import android.os.UserHandle; public class NfcRootActivity extends Activity { @@ -33,7 +35,7 @@ public class NfcRootActivity extends Activity { final Intent launchIntent = intent.getParcelableExtra(EXTRA_LAUNCH_INTENT); if (launchIntent != null) { try { - startActivity(launchIntent); + startActivityAsUser(launchIntent, UserHandle.CURRENT); } catch (ActivityNotFoundException e) { } } |