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

Commit e7b4ba9f authored by Michal Karpinski's avatar Michal Karpinski Committed by android-build-merger
Browse files

Merge "Adjusting getTitleFromOrganizationName() after API changes" into nyc-dev 

am: d4f4e2d5

* commit 'd4f4e2d5':
  Adjusting getTitleFromOrganizationName() after API changes

Change-Id: I75c070a7549e68679492e8d44676bd814bedc117
parents c37ce205 d4f4e2d5

src/com/android/settings/ConfirmDeviceCredentialActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }

}