commit b2edb4de9db1d76db2d91f6f603867f1bd19b6de
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 17 09:24:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 17 09:24:35 2019 +0000
tree 258fbe1900f257b59d216ac8a09894fa07baf290
parent f4bf5802d5d80183ab9d109657a88b187223e4bb
parent e496774815d330bf27e6de2f47fa9e3b8fb7f325

Merge "Revert "Check for providers being enabled"" into ub-launcher3-qt-dev

src/com/android/customization/model/clock/ContentProviderClockProvider.java

diff --git a/src/com/android/customization/model/clock/ContentProviderClockProvider.java b/src/com/android/customization/model/clock/ContentProviderClockProvider.java
index 5964236..375f3c1 100644
--- a/src/com/android/customization/model/clock/ContentProviderClockProvider.java
+++ b/src/com/android/customization/model/clock/ContentProviderClockProvider.java
@@ -37,7 +37,7 @@
 
     @Override
     public boolean isAvailable() {
-        return mProviderInfo != null && mProviderInfo.isEnabled();
+        return mProviderInfo != null;
     }
 
     @Override

src/com/android/customization/model/grid/LauncherGridOptionsProvider.java

diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
index af7745a..7c7f8d4 100644
--- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
+++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
@@ -75,7 +75,7 @@
     }
 
     boolean areGridsAvailable() {
-        return mProviderInfo != null && mProviderInfo.isEnabled();
+        return mProviderInfo != null;
     }
 
     /**