Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev

2016-05-12 20:52:24 +00:00
parent 1590b8c005 059b0fa060
commit ef505d628a
8 changed files with 138 additions and 11 deletions
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -283,6 +283,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(),