From 637d24c8b96389d22ad994f17daad16949f0266e Mon Sep 17 00:00:00 2001 From: Nicolas Prevot Date: Thu, 9 Jun 2016 11:27:57 +0100 Subject: [PATCH] Fix rendering of policy transparency activity. Use the dialog's context instead of the activity context to inflate the view. BUG:29172155 Change-Id: I0fb32e3d4bfc522a4c8b6d7a6ed55acd01f97446 --- .../android/settings/ShowAdminSupportDetailsDialog.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/ShowAdminSupportDetailsDialog.java b/src/com/android/settings/ShowAdminSupportDetailsDialog.java index 152a89ca914..8ee07f92b23 100644 --- a/src/com/android/settings/ShowAdminSupportDetailsDialog.java +++ b/src/com/android/settings/ShowAdminSupportDetailsDialog.java @@ -59,14 +59,13 @@ public class ShowAdminSupportDetailsDialog extends Activity mDpm = getSystemService(DevicePolicyManager.class); mEnforcedAdmin = getAdminDetailsFromIntent(getIntent()); - mDialogView = LayoutInflater.from(this).inflate( + AlertDialog.Builder builder = new AlertDialog.Builder(this); + mDialogView = LayoutInflater.from(builder.getContext()).inflate( R.layout.admin_support_details_dialog, null); initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId); - - new AlertDialog.Builder(this) - .setView(mDialogView) + builder.setOnDismissListener(this) .setPositiveButton(R.string.okay, null) - .setOnDismissListener(this) + .setView(mDialogView) .show(); }