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

Commit 0e111e69 authored by Benjamin Franz's avatar Benjamin Franz
Browse files

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

This reverts commit ff3d76df.

Change-Id: Ibdfdc880629ace541744c2ba1f46393e70ae53f5
parent 9061164b

src/com/android/settings/ConfirmDeviceCredentialActivity.java

+13 −0
Original line number Diff line number Diff line
@@ -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,11 @@ public class ConfirmDeviceCredentialActivity extends Activity { 
                Log.e(TAG, "Invalid intent extra", se);

            }

        }

        // if the client app did not hand in a title and we are about to show the work challenge,

        // check whether there is a policy setting the organization name and use that as title

        if ((title == null) && Utils.isManagedProfile(UserManager.get(this), userId)) {

            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 +91,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;

    }

}