Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9abe869a authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

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

am: 033f12b6

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

Change-Id: I529bfbdc9b4c6f9d05035f6ae4ba98d4b11040e8
parents 3948712e 033f12b6

src/com/android/settings/DeviceAdminAdd.java

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ public class DeviceAdminAdd extends Activity { 
                    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);