Adjusting getOrganizationName() call after API change

Michal Karpinski · Michal Karpinski · commit 86e6da5e30e5 · 2016-04-13T15:23:24.000+01:00
Bug: 27531295
Change-Id: Ie315e0eb50b23b68a4bc05e5b32eb5f04599981d
diff --git a/app/src/main/java/com/afwsamples/testdpc/profilepolicy/ProfilePolicyManagementFragment.java b/app/src/main/java/com/afwsamples/testdpc/profilepolicy/ProfilePolicyManagementFragment.java
@@ -244,7 +244,9 @@ private void initializeOrganizationInfoPreferences() {
 
         if (mSetOrganizationNamePreference.isEnabled()) {
             mSetOrganizationNamePreference.setOnPreferenceChangeListener(this);
-            final String name = mDevicePolicyManager.getOrganizationName(mAdminComponentName);
+            CharSequence organizationName = mDevicePolicyManager.getOrganizationName(
+                    mAdminComponentName);
+            final String name = organizationName != null ? organizationName.toString() : null;
             mSetOrganizationNamePreference.setSummary(name);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,9 @@ private void initializeOrganizationInfoPreferences() {`
`244`	`244`
`245`	`245`	`if (mSetOrganizationNamePreference.isEnabled()) {`
`246`	`246`	`mSetOrganizationNamePreference.setOnPreferenceChangeListener(this);`
`247`		`- final String name = mDevicePolicyManager.getOrganizationName(mAdminComponentName);`
	`247`	`+ CharSequence organizationName = mDevicePolicyManager.getOrganizationName(`
	`248`	`+ mAdminComponentName);`
	`249`	`+ final String name = organizationName != null ? organizationName.toString() : null;`
`248`	`250`	`mSetOrganizationNamePreference.setSummary(name);`
`249`	`251`	`}`
`250`	`252`	`}`