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

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

Browse Source 
am: d4f4e2d

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

Change-Id: I75c070a7549e68679492e8d44676bd814bedc117
This commit is contained in:
Michal Karpinski
2016-04-13 13:32:19 +00:00
committed by android-build-merger
parent c37ce205d2 d4f4e2d5b5
commit e7b4ba9f53
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/ConfirmDeviceCredentialActivity.java
View File

@@ -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;
}
}