Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-07-29 00:47:33 +00:00
committed by Android (Google) Code Review
parent 5b009d523c b795d7c4a3
commit b310c89453
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -530,13 +530,13 @@ final class ActivityRecord {
AttributeCache.Entry ent = AttributeCache.instance().get(packageName,
realTheme, com.android.internal.R.styleable.Window, userId);
final boolean translucent = ent.array.getBoolean(
final boolean translucent = ent != null && (ent.array.getBoolean(
com.android.internal.R.styleable.Window_windowIsTranslucent, false)
|| (!ent.array.hasValue(
com.android.internal.R.styleable.Window_windowIsTranslucent)
&& ent.array.getBoolean(
com.android.internal.R.styleable.Window_windowSwipeToDismiss,
false));
false)));
fullscreen = ent != null && !ent.array.getBoolean(
com.android.internal.R.styleable.Window_windowIsFloating, false)
&& !translucent;