Merge "Fix rendering of policy transparency activity." into nyc-dev

2016-06-13 12:37:05 +00:00
parent c66bffa31f 637d24c8b9
commit 98704bc495
1 changed files with 4 additions and 5 deletions
--- 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();
    }