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

Merge "Read default confirm credentials title from policy"

Browse Source
This commit is contained in:
Benjamin Franz
2016-01-29 11:38:56 +00:00
committed by Android (Google) Code Review
parent c6ce1793f7 6e2821dc1a
commit a1f84c745d
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,8 @@ package com.android.settings;
import android.app.Activity;
import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
import android.os.Binder;
import android.os.Bundle;
@@ -72,6 +74,10 @@ public class ConfirmDeviceCredentialActivity extends Activity {
Log.e(TAG, "Invalid intent extra", se);
}
}
// if the client app did not hand in a title, we check whether there is a policy setting it
if (title == null) {
title = getTitleFromOrganizationName(userId);
}
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
details, false /* returnCredentials */, true /* isExternal */, userId)) {
@@ -84,4 +90,10 @@ public class ConfirmDeviceCredentialActivity extends Activity {
private boolean isInternalActivity() {
return this instanceof ConfirmDeviceCredentialActivity.InternalActivity;
}
private String getTitleFromOrganizationName(int userId) {
DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(
Context.DEVICE_POLICY_SERVICE);
return (dpm != null) ? dpm.getOrganizationNameForUser(userId) : null;
}
}