summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-04-26 14:56:14 -0700
committerClark Scheff <clark@cyngn.com>2016-04-26 14:58:49 -0700
commit766d3bb5e46f262fdade4f1837e6bf421d4b0313 (patch)
treeac097d51097c03f9ac616ed6317d379ba8896083
parent8dd6c305f252afd329ea52703a98d36d5eee8bdc (diff)
downloadframeworks_base-766d3bb5e46f262fdade4f1837e6bf421d4b0313.zip
frameworks_base-766d3bb5e46f262fdade4f1837e6bf421d4b0313.tar.gz
frameworks_base-766d3bb5e46f262fdade4f1837e6bf421d4b0313.tar.bz2
SysUI: Don't call removeAllViews on AdapterView
Change-Id: I957c87e499fb719d1d45671c968c625dac75ecc7 TICKET: OPO-649
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 661232f..a7d62cd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -106,6 +106,7 @@ import android.view.animation.AccelerateInterpolator;
import android.view.animation.Interpolator;
import android.view.animation.LinearInterpolator;
import android.view.animation.PathInterpolator;
+import android.widget.AdapterView;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
@@ -3882,7 +3883,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
removeAllViews((ViewGroup) child);
}
}
- parent.removeAllViews();
+
+ // AdapterView does not support removeAllViews so check before calling
+ if (!(parent instanceof AdapterView)) parent.removeAllViews();
}
/**