Merge "Adjusting getOrganizationName() call after API change" into ub-testdpc-nyc

Michal Karpinski · Android (Google) Code Review · commit 1497758865e4 · 2016-04-13T14:29:10.000Z
diff --git a/app/src/main/java/com/afwsamples/testdpc/profilepolicy/ProfilePolicyManagementFragment.java b/app/src/main/java/com/afwsamples/testdpc/profilepolicy/ProfilePolicyManagementFragment.java
@@ -249,7 +249,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
`@@ -249,7 +249,9 @@ private void initializeOrganizationInfoPreferences() {`
`249`	`249`
`250`	`250`	`if (mSetOrganizationNamePreference.isEnabled()) {`
`251`	`251`	`mSetOrganizationNamePreference.setOnPreferenceChangeListener(this);`
`252`		`- final String name = mDevicePolicyManager.getOrganizationName(mAdminComponentName);`
	`252`	`+ CharSequence organizationName = mDevicePolicyManager.getOrganizationName(`
	`253`	`+ mAdminComponentName);`
	`254`	`+ final String name = organizationName != null ? organizationName.toString() : null;`
`253`	`255`	`mSetOrganizationNamePreference.setSummary(name);`
`254`	`256`	`}`
`255`	`257`	`}`