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

Commit b7eb3901 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

* commit 'b310c894':
  Fix issue #22802691: APR: NPE in ActivityRecord
parents 779ccbe3 b310c894

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;