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

Commit a1f84c74 authored by Benjamin Franz's avatar Benjamin Franz Committed by Android (Google) Code Review
Browse files

Merge "Read default confirm credentials title from policy"

parents c6ce1793 6e2821dc
Loading
Loading
Loading
Loading
+12 −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,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;
    }
}