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

am: 98704bc495

Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14
This commit is contained in:
Nicolas Prevot
2016-06-13 12:50:11 +00:00
committed by android-build-merger

View File

@@ -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();
}