commit 91f287908b78c328e8a45f2b7bcf8f395680d59f
author Sudheer Shanka <sudheersai@google.com> Wed Apr 13 20:12:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 13 20:12:03 2016 +0000
tree 43c3e20acab0d2503bf534102990272b693f6f32
parent 906927f1c8e54496ab86c006d284cb32a4c35017
parent 4f0c7d3636f1f8b9deb1aca94efa9513ef312aec

Merge "Update usage of DPM.getLongSupportMessageForUser." into nyc-dev

src/com/android/settings/DeviceAdminAdd.java

diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index d2ba508..ddee6aa 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -558,7 +558,7 @@
                     mActionButton.setText(R.string.remove_device_admin);
                 }
             }
-            String supportMessage = mDPM.getLongSupportMessageForUser(
+            CharSequence supportMessage = mDPM.getLongSupportMessageForUser(
                     mDeviceAdmin.getComponent(), UserHandle.myUserId());
             if (!TextUtils.isEmpty(supportMessage)) {
                 mSupportMessage.setText(supportMessage);