From 60598ea0aafb297d0c7617410edded5c0f7d1c53 Mon Sep 17 00:00:00 2001
From: Oren Blasberg <orenb@google.com>
Date: Fri, 26 Feb 2016 11:01:23 -0800
Subject: [PATCH] WallpaperManager: support custom default cropper.

If the component name is specified by the OEM, that component is used
as the default (fallback) cropper rather than
com.android.wallpapercropper.

Bug: 26084319
Change-Id: I5c79beb8e84721944e752bda637cdf0377b8d826
---
 core/java/android/app/WallpaperManager.java | 4 +++-
 core/res/res/values/config.xml              | 5 +++++
 core/res/res/values/symbols.xml             | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java
index c3512eca3b50..b7e31ab752fa 100644
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -767,7 +767,9 @@ public class WallpaperManager {
         }
 
         // fallback crop activity
-        cropAndSetWallpaperIntent.setPackage("com.android.wallpapercropper");
+        final String cropperPackage = mContext.getString(
+                com.android.internal.R.string.config_wallpaperCropperPackage);
+        cropAndSetWallpaperIntent.setPackage(cropperPackage);
         List<ResolveInfo> cropAppList = packageManager.queryIntentActivities(
                 cropAndSetWallpaperIntent, 0);
         if (cropAppList.size() > 0) {
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 9552820714d3..b65f19b08e07 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2474,4 +2474,9 @@
          much in the way of user data.
     -->
     <bool name="config_strongAuthRequiredOnBoot">true</bool>
+
+    <!-- Wallpaper cropper package. Used as the default cropper if the active launcher doesn't
+         handle wallpaper cropping.
+    -->
+    <string name="config_wallpaperCropperPackage" translatable="false">com.android.wallpapercropper</string>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ff247b5dcc90..44a7a8d39077 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2541,4 +2541,7 @@
   <java-symbol type="string" name="carrier_app_notification_title" />
   <java-symbol type="string" name="carrier_app_notification_text" />
   <java-symbol type="string" name="negative_duration" />
+
+  <!-- WallpaperManager config -->
+  <java-symbol type="string" name="config_wallpaperCropperPackage" />
 </resources>
-- 
2.11.0