diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index fe76ae15e57..9410b5a0194 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -13,10 +13,17 @@
  */
 package com.android.settings.display;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
 
+import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
@@ -24,18 +31,38 @@ import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
 
+import java.util.List;
+
 public class WallpaperPreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin {
 
+    private static final String TAG = "WallpaperPrefController";
+
     public static final String KEY_WALLPAPER = "wallpaper";
 
+    private final String mWallpaperPackage;
+    private final String mWallpaperClass;
+
     public WallpaperPreferenceController(Context context) {
         super(context);
+        mWallpaperPackage = mContext.getString(R.string.config_wallpaper_picker_package);
+        mWallpaperClass = mContext.getString(R.string.config_wallpaper_picker_class);
     }
 
     @Override
     public boolean isAvailable() {
-        return true;
+        if (TextUtils.isEmpty(mWallpaperPackage) || TextUtils.isEmpty(mWallpaperClass)) {
+            Log.e(TAG, "No Wallpaper picker specified!");
+            return false;
+        }
+        final ComponentName componentName =
+                new ComponentName(mWallpaperPackage, mWallpaperClass);
+        final PackageManager pm = mContext.getPackageManager();
+        final Intent intent = new Intent();
+        intent.setComponent(componentName);
+        final List<ResolveInfo> resolveInfos =
+                pm.queryIntentActivities(intent, 0 /* flags */);
+        return resolveInfos != null && resolveInfos.size() != 0;
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
new file mode 100644
index 00000000000..1419ad551da
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WallpaperPreferenceControllerTest {
+
+    private static final String WALLPAPER_PACKAGE = "TestPkg";
+    private static final String WALLPAPER_CLASS = "TestCls";
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private WallpaperPreferenceController mController;
+
+    @Before
+    public void setUp() throws PackageManager.NameNotFoundException {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getString(R.string.config_wallpaper_picker_package))
+                .thenReturn(WALLPAPER_PACKAGE);
+        when(mContext.getString(R.string.config_wallpaper_picker_class))
+                .thenReturn(WALLPAPER_CLASS);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        mController = new WallpaperPreferenceController(mContext);
+    }
+
+    @Test
+    public void isAvailable_wallpaerPickerEnabled_shouldReturnTrue() {
+        final List<ResolveInfo> resolveInfos = new ArrayList<>();
+        resolveInfos.add(mock(ResolveInfo.class));
+        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
+                .thenReturn(resolveInfos);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaerPickerDisbled_shouldReturnFalseAndNoCrash() {
+        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
+
+        assertThat(mController.isAvailable()).isFalse();
+
+        final List<ResolveInfo> resolveInfos = new ArrayList<>();
+        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
+                .thenReturn(resolveInfos);
+
+        assertThat(mController.isAvailable()).isFalse();
+        // should not crash
+    }
+}