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

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

Browse Source 
* commit 'b310c8945330a0a94abae34451e0bdc227f52035':
  Fix issue #22802691: APR: NPE in ActivityRecord
This commit is contained in:
Dianne Hackborn
2015-07-29 01:01:54 +00:00
committed by Android Git Automerger
parent cf887f5c91 b310c89453
commit 37cf391caf
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;