commit df1cbdcf56945c0eb86ecbfd247341b94b0aa563
author Sudheer Shanka <sudheersai@google.com> Wed Feb 24 14:32:53 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 24 14:32:54 2016 +0000
tree ab9a383fd1de7d8d8c7d511fae58856684f81767
parent 346c1f4f2461fc7c38e4c2ad87f26864ad4fa347
parent e3dbfb1a6b480032afb784bd6e7d75f2e1fb5c5f

Merge "Update the admin app icon in the support dialog." into nyc-dev

src/com/android/settings/ShowAdminSupportDetailsDialog.java

diff --git a/src/com/android/settings/ShowAdminSupportDetailsDialog.java b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
index f44c4b8..2f2379a 100644
--- a/src/com/android/settings/ShowAdminSupportDetailsDialog.java
+++ b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
@@ -60,7 +60,7 @@
 
         mDialogView = LayoutInflater.from(this).inflate(
                 R.layout.admin_support_details_dialog, null);
-        setAdminSupportDetails(this, mDialogView, mEnforcedAdmin, true);
+        initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId);
 
         new AlertDialog.Builder(this)
                 .setView(mDialogView)
@@ -75,7 +75,7 @@
         EnforcedAdmin admin = getAdminDetailsFromIntent(intent);
         if (!mEnforcedAdmin.equals(admin)) {
             mEnforcedAdmin = admin;
-            setAdminSupportDetails(this, mDialogView, mEnforcedAdmin, true);
+            initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId);
         }
     }