PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update usage of DPM.getLongSupportMessageForUser." into nyc-dev am: 91f2879

Browse Source 
am: 033f12b

* commit '033f12b680e916a241709c317e261c05bbfbdd60':
  Update usage of DPM.getLongSupportMessageForUser.

Change-Id: I529bfbdc9b4c6f9d05035f6ae4ba98d4b11040e8
This commit is contained in:
Sudheer Shanka
2016-04-13 20:30:51 +00:00
committed by android-build-merger
parent 3948712e7c 033f12b680
commit 9abe869a4c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DeviceAdminAdd.java
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);