diff options
| author | Tony <twickham@google.com> | 2017-06-02 19:33:49 -0700 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2017-06-02 19:33:49 -0700 |
| commit | f514f207c2f2e22c4df179ce0d8eb16966e6b5dc (patch) | |
| tree | a6f24dd793e437135bb4624d15f75eae5a77e085 /AndroidManifest-common.xml | |
| parent | d74633cbc559109e57b0f4531fb6556e79d7a453 (diff) | |
| parent | 629a67c5ac33409ebccf13284505a4cadc65656a (diff) | |
| download | android_packages_apps_Trebuchet-f514f207c2f2e22c4df179ce0d8eb16966e6b5dc.tar.gz android_packages_apps_Trebuchet-f514f207c2f2e22c4df179ce0d8eb16966e6b5dc.tar.bz2 android_packages_apps_Trebuchet-f514f207c2f2e22c4df179ce0d8eb16966e6b5dc.zip | |
resolve merge conflicts of 629a67c5a to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5aed3f0c978976c499b532c816d81196cb11e3a1
Diffstat (limited to 'AndroidManifest-common.xml')
| -rw-r--r-- | AndroidManifest-common.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index dd1446635..7c040a808 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -82,7 +82,8 @@ <service android:name="com.android.launcher3.dynamicui.ColorExtractionService" android:exported="false" - android:process=":wallpaper_chooser"> + android:process=":wallpaper_chooser" + android:permission="android.permission.BIND_JOB_SERVICE"> </service> <service |