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

Merge "Revert "Read default confirm credentials title from policy""

Browse Source
This commit is contained in:
Benjamin Franz
2016-02-01 16:34:26 +00:00
committed by Android (Google) Code Review
parent f75e1b1390 ff3d76dfd4
commit ed5a75a476
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,6 @@ package com.android.settings;
import android.app.Activity; import android.app.Activity;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Binder; import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
@@ -74,10 +72,6 @@ public class ConfirmDeviceCredentialActivity extends Activity {
Log.e(TAG, "Invalid intent extra", se); 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); ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title, if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
details, false /* returnCredentials */, true /* isExternal */, userId)) { details, false /* returnCredentials */, true /* isExternal */, userId)) {
@@ -90,10 +84,4 @@ public class ConfirmDeviceCredentialActivity extends Activity {
private boolean isInternalActivity() { private boolean isInternalActivity() {
return this instanceof ConfirmDeviceCredentialActivity.InternalActivity; 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;
}
} }