From 435ec6e6f4f49b7f7d968203724966c1f28281d7 Mon Sep 17 00:00:00 2001
From: Michal Karpinski <mkarpinski@google.com>
Date: Tue, 12 Apr 2016 15:20:08 +0100
Subject: [PATCH] Adjusting getTitleFromOrganizationName() after API changes

Bug: 27531295
Change-Id: I566aae079451ea3d001fd517f5fafc0991f55ad2
---
 src/com/android/settings/ConfirmDeviceCredentialActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
index 16d068548eb..d71ba9b5f04 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -95,6 +95,8 @@ public class ConfirmDeviceCredentialActivity extends Activity {
     private String getTitleFromOrganizationName(int userId) {
         DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
-        return (dpm != null) ? dpm.getOrganizationNameForUser(userId) : null;
+        CharSequence organizationNameForUser = (dpm != null)
+                ? dpm.getOrganizationNameForUser(userId) : null;
+        return organizationNameForUser != null ? organizationNameForUser.toString() : null;
     }
 }