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

This commit is contained in:
Sudheer Shanka
2016-04-13 20:12:02 +00:00
committed by Android (Google) Code Review

View File

@@ -558,7 +558,7 @@ public class DeviceAdminAdd extends Activity {
mActionButton.setText(R.string.remove_device_admin); mActionButton.setText(R.string.remove_device_admin);
} }
} }
String supportMessage = mDPM.getLongSupportMessageForUser( CharSequence supportMessage = mDPM.getLongSupportMessageForUser(
mDeviceAdmin.getComponent(), UserHandle.myUserId()); mDeviceAdmin.getComponent(), UserHandle.myUserId());
if (!TextUtils.isEmpty(supportMessage)) { if (!TextUtils.isEmpty(supportMessage)) {
mSupportMessage.setText(supportMessage); mSupportMessage.setText(supportMessage);