diff options
author | Martijn Coenen <maco@google.com> | 2012-09-14 15:01:07 -0700 |
---|---|---|
committer | Martijn Coenen <maco@google.com> | 2012-10-08 21:19:12 -0700 |
commit | 88913e627332e95f916f59c826b075e7e5959d36 (patch) | |
tree | d52714559667cf369d7707fa4a3174062e585520 /src/com/android/nfc/NfcRootActivity.java | |
parent | b1ba0d2a520ee2c5543a2ae9e017e1ef424f9265 (diff) | |
download | packages_apps_nfc-88913e627332e95f916f59c826b075e7e5959d36.zip packages_apps_nfc-88913e627332e95f916f59c826b075e7e5959d36.tar.gz packages_apps_nfc-88913e627332e95f916f59c826b075e7e5959d36.tar.bz2 |
NFC changes for multi-user support.
- Instantiate full NfcService for user 0, light
NfcApplication instance for other users
- Invalidate component cache on user switch
- Start all activities based on current logged in user
- Query PM based on current logged in user
- Only keep track of apps using the SE for the owner
- Throw SecurityException on SE calls for non-owner users
Bug: 6926465
Change-Id: If686efd34825a1bdd86fc06234ac7402d44a2afa
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) { } } |