commit ff3d76dfd4c88bdf52ae9467307a86651bf7cd98
author Benjamin Franz <bfranz@google.com> Mon Feb 01 16:27:16 2016 +0000
committer Benjamin Franz <bfranz@google.com> Mon Feb 01 16:29:15 2016 +0000
tree 62e2ba03b23938e57be112d8e7b8f91cae3f36e5
parent 6e2821dc1ab96de168a057d25acc1ad87e50e606

Revert "Read default confirm credentials title from policy"

This reverts commit 6e2821dc1ab96de168a057d25acc1ad87e50e606.

Bug: 26895493

Change-Id: I27e7199dc25d423219d966f9f2cbd671bbf094c7

src/com/android/settings/ConfirmDeviceCredentialActivity.java

diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
index fe22f87..28c0515 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -19,8 +19,6 @@
 
 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;
@@ -74,10 +72,6 @@
                 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)) {
@@ -90,10 +84,4 @@
     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;
-    }
 }