Merge "Change ManageCrossProfileWidgetProviderUtil to use provider." into mnc-dev

Author: Sudheer Shanka

app/src/main/java/com/google/android/testdpc/profilepolicy/ProfilePolicyManagementFragment.java

@@ -195,7 +195,7 @@ private void showDisabledAppWidgetList() {
                 = ManageCrossProfileWidgetProviderUtil.getInstance(getActivity())
                 .getDisabledCrossProfileWidgetProvidersList();
         if (disabledCrossProfileWidgetProvidersList.isEmpty()) {
-            showToast(R.string.all_accessibility_services_enabled);
+            showToast(R.string.all_cross_profile_widget_providers_are_enabled);
         } else {
             AppInfoArrayAdapter appInfoArrayAdapter = new AppInfoArrayAdapter(getActivity(),
                     R.layout.app_row, disabledCrossProfileWidgetProvidersList);

app/src/main/java/com/google/android/testdpc/profilepolicy/crossprofilewidgetprovider/ManageCrossProfileWidgetProviderUtil.java

@@ -69,11 +69,9 @@ public List<String> getDisabledCrossProfileWidgetProvidersList() {
         List<AppWidgetProviderInfo> appWidgetProviderInfoList = mAppWidgetManager
                 .getInstalledProviders();
         for (AppWidgetProviderInfo appWidgetProviderInfo : appWidgetProviderInfoList) {
-            if (appWidgetProviderInfo.configure != null &&
-                    !enabledCrossProfileWidgetProvidersList.contains(
-                            appWidgetProviderInfo.configure.getPackageName())) {
-                disabledCrossProfileWidgetProvidersPackageNameSet.add(
-                        appWidgetProviderInfo.configure.getPackageName());
+            String appWidgetProviderPackage = appWidgetProviderInfo.provider.getPackageName();
+            if (!enabledCrossProfileWidgetProvidersList.contains(appWidgetProviderPackage)) {
+                disabledCrossProfileWidgetProvidersPackageNameSet.add(appWidgetProviderPackage);
             }
         }
         return new ArrayList<String>(disabledCrossProfileWidgetProvidersPackageNameSet);