diff options
| author | Likai Ding <likaid@codeaurora.org> | 2016-06-17 15:30:06 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2016-06-17 15:30:06 +0800 |
| commit | 49eee1c8b110f24c89e3d0998fc2802ac33814d3 (patch) | |
| tree | b4e58fb1c209a90a023b786266666e6e83acec9e | |
| parent | 7866bab28d1597eab8a2af01e10546c9e1ac0a37 (diff) | |
| download | android_packages_apps_Gallery2-49eee1c8b110f24c89e3d0998fc2802ac33814d3.tar.gz android_packages_apps_Gallery2-49eee1c8b110f24c89e3d0998fc2802ac33814d3.tar.bz2 android_packages_apps_Gallery2-49eee1c8b110f24c89e3d0998fc2802ac33814d3.zip | |
Gallery: fix edit UI loading
Use full name of ProcessService because of package name change.
Also fix a crash when makeup library is not present.
Change-Id: Ib4a7cea2a77df2473bc8078507d9c5aadf4fe360
CRs-Fixed: 1030458
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a71c0b72a..f3a7a9bf6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -286,7 +286,7 @@ android:writePermission="com.android.gallery3d.filtershow.permission.WRITE" /> <service - android:name=".filtershow.pipeline.ProcessingService" + android:name="com.android.gallery3d.filtershow.pipeline.ProcessingService" android:exported="false" /> <activity diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 21962424a..7445abf31 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -1085,7 +1085,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL mCategoryLooksAdapter.reflectImagePreset(preset); mCategoryBordersAdapter.reflectImagePreset(preset); mCategoryFiltersAdapter.reflectImagePreset(preset); - mCategoryMakeupAdapter.reflectImagePreset(preset); + if (mCategoryMakeupAdapter != null) { + mCategoryMakeupAdapter.reflectImagePreset(preset); + } mCategoryDualCamAdapter.reflectImagePreset(preset); } |