diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-28 17:40:06 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-07-28 17:40:06 -0700 |
| commit | b795d7c4a3db56d07a411a434c447819fd18363f (patch) | |
| tree | a706091a27c8aa949e7c4b1b5bc6a41510b4f13b /services | |
| parent | 3551a59b277fd4dc924f48116c153a50fb0913eb (diff) | |
| download | frameworks_base-b795d7c4a3db56d07a411a434c447819fd18363f.zip frameworks_base-b795d7c4a3db56d07a411a434c447819fd18363f.tar.gz frameworks_base-b795d7c4a3db56d07a411a434c447819fd18363f.tar.bz2 | |
Fix issue #22802691: APR: NPE in ActivityRecord
Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da
Diffstat (limited to 'services')
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityRecord.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index d16eab6..0957eb5 100755 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -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; |