diff options
| author | Martijn Coenen <maco@google.com> | 2014-04-25 16:55:41 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2014-05-08 16:30:13 -0700 |
| commit | da772582c17e3f5ffe36e4cab3e1ede3cba32060 (patch) | |
| tree | 6843fcd025473e03e4418bd02387ac989c37d4b2 /AndroidManifest.xml | |
| parent | a2772e9423cc84c1ba6ad37abd9c4fe929c976ae (diff) | |
| download | android_packages_apps_Nfc-da772582c17e3f5ffe36e4cab3e1ede3cba32060.tar.gz android_packages_apps_Nfc-da772582c17e3f5ffe36e4cab3e1ede3cba32060.tar.bz2 android_packages_apps_Nfc-da772582c17e3f5ffe36e4cab3e1ede3cba32060.zip | |
HCE/SE foreground support.
- Allow apps to specify a service they'd like to execute while in foreground.
- Refactored code that determines priority into PreferredServices
- Made a generic ForegroundUtils class that use IProcessObserver
to monitor foreground/background state transitions.
- Simplified logic in RegisteredAidCache that determines where an AID goes. Order is:
1) Foreground (if allowed to override)
2) Payment default app
3) Other.
- Added dump() to classes for easier debugging
Change-Id: Idf871ea91d10102b82b170a45b519be98adc9edf
Diffstat (limited to 'AndroidManifest.xml')
| -rwxr-xr-x | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index eab1802d..e6c3ddaa 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -43,6 +43,7 @@ <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" /> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.SET_ACTIVITY_WATCHER" /> <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" /> <uses-permission android:name="com.android.permission.HANDOVER_STATUS" /> <application android:name=".NfcApplication" |