summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stokes <alanstokes@google.com>2019-03-19 16:38:25 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-19 16:38:25 -0700
commit4bddc5bd20e7216f56eb9b24ea16150559dde03b (patch)
treee5ebbb8d75bf1bec885b7ce848c95f108a59c683
parenta5369033cafd8710adf3fe5c94a080494ae9ad91 (diff)
parent67e61207d44175f37724bd88c47ccbd59127b455 (diff)
downloadStk-4bddc5bd20e7216f56eb9b24ea16150559dde03b.tar.gz
Merge "Add START_ACTIVITIES_FROM_BACKGROUND permission for com.android.stk"
am: 67e61207d4 Change-Id: I794ddf5726a329f686aa99205f25d7b5be5e511c
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 289aeef..3ab0e05 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -26,6 +26,7 @@
<uses-permission android:name="android.permission.GET_TASKS"/>
<uses-permission android:name="android.permission.RECEIVE_STK_COMMANDS" />
<uses-permission android:name="android.permission.SET_ACTIVITY_WATCHER" />
+ <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
<uses-permission android:name="android.permission.USER_ACTIVITY" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />