| commit | 3bc2536d1ae522e8e519252cbe82acb56cc7ea50 | [log] [tgz] |
|---|---|---|
| author | Santiago Etchebehere <santie@google.com> | Wed May 15 13:29:13 2019 -0700 |
| committer | Santiago Etchebehere <santie@google.com> | Wed May 15 13:29:13 2019 -0700 |
| tree | 700360af60b3023d0d2f68735d833958b62095fc | |
| parent | 80309f15b838dab0e494fc8e5f43ba62b85ab6fe [diff] |
Check for providers being enabled Don't just look for a provider to be present also make sure they're enabled, so they can be disabled programmatically if needed. Bug: 118757588 Change-Id: I2d47b357860a89a0dda8a7d18ed0227efd492b67
diff --git a/src/com/android/customization/model/clock/ContentProviderClockProvider.java b/src/com/android/customization/model/clock/ContentProviderClockProvider.java index 375f3c1..5964236 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; + return mProviderInfo != null && mProviderInfo.isEnabled(); } @Override
diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java index 7c7f8d4..af7745a 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; + return mProviderInfo != null && mProviderInfo.isEnabled(); } /**