Skip to content

Commit b310c89

Browse files
Dianne HackbornAndroid (Google) Code Review
authored andcommitted
Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev
2 parents 5b009d5 + b795d7c commit b310c89

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

services/core/java/com/android/server/am/ActivityRecord.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,13 +530,13 @@ boolean isNotResolverActivity() {
530530

531531
AttributeCache.Entry ent = AttributeCache.instance().get(packageName,
532532
realTheme, com.android.internal.R.styleable.Window, userId);
533-
final boolean translucent = ent.array.getBoolean(
533+
final boolean translucent = ent != null && (ent.array.getBoolean(
534534
com.android.internal.R.styleable.Window_windowIsTranslucent, false)
535535
|| (!ent.array.hasValue(
536536
com.android.internal.R.styleable.Window_windowIsTranslucent)
537537
&& ent.array.getBoolean(
538538
com.android.internal.R.styleable.Window_windowSwipeToDismiss,
539-
false));
539+
false)));
540540
fullscreen = ent != null && !ent.array.getBoolean(
541541
com.android.internal.R.styleable.Window_windowIsFloating, false)
542542
&& !translucent;

0 commit comments

Comments
 (0)