Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b795d7c4 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #22802691: APR: NPE in ActivityRecord 

Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da
parent 3551a59b

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

+2 −2
Original line number Diff line number Diff line
@@ -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;