Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a am: 1d1ca8e590

am: 3b7eedabb8

* commit '3b7eedabb85f18229911a67d91864849532f8bba':
  Allow DPMs to restrict Remote Input on Keyguard

Change-Id: Iadad066e04fde46b247634b9f2d36f472deb4285

src/com/android/settings/dashboard/DashboardAdapter.java

@@ -288,6 +288,9 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
     }
 
     public void disableSuggestion(Tile suggestion) {
+        if (mSuggestionParser == null) {
+            return;
+        }
         if (mSuggestionParser.dismissSuggestion(suggestion)) {
             mContext.getPackageManager().setComponentEnabledSetting(
                     suggestion.intent.getComponent(),