From f049e24c644912a308ca283ba1c75d678a09f4a8 Mon Sep 17 00:00:00 2001
From: Michael Kwan <mkwan@google.com>
Date: Wed, 7 Sep 2016 13:15:55 -0700
Subject: [PATCH] Ensure preference icon is returned when inflated from XML
 even if it has not been displayed yet.

Bug: 31343032
Change-Id: Ifa2c84b3091c2cfc5b98da6f30bb1ba060cd26e7
---
 core/java/android/preference/Preference.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java
index b1cad0538d312..ec1e102c92896 100644
--- a/core/java/android/preference/Preference.java
+++ b/core/java/android/preference/Preference.java
@@ -719,6 +719,9 @@ public class Preference implements Comparable<Preference> {
      * @see #setIcon(Drawable)
      */
     public Drawable getIcon() {
+        if (mIcon == null && mIconResId != 0) {
+            mIcon = getContext().getDrawable(mIconResId);
+        }
         return mIcon;
     }