diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-11-29 21:25:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-11-29 21:25:59 +0000 |
| commit | aae9f84ce8b81142d83797de2bb1a5b3d280e640 (patch) | |
| tree | 1263b2a517e44e33053b4e8a00e7f9a131441987 /core/java/android | |
| parent | 918d002ac09196c49090fcb75a851eff65e39f67 (diff) | |
| parent | c10e0e2d193a5f494f6f9939e6097514e51b5a16 (diff) | |
Merge "Fix crash in slices"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/slice/SliceItem.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/slice/SliceItem.java b/core/java/android/app/slice/SliceItem.java index 8d81199185d2..cdeee3575756 100644 --- a/core/java/android/app/slice/SliceItem.java +++ b/core/java/android/app/slice/SliceItem.java @@ -216,7 +216,7 @@ public final class SliceItem implements Parcelable { * @return The slice held by this {@link #FORMAT_ACTION} or {@link #FORMAT_SLICE} SliceItem */ public Slice getSlice() { - if (getFormat() == FORMAT_ACTION) { + if (FORMAT_ACTION.equals(getFormat())) { return ((Pair<PendingIntent, Slice>) mObj).second; } return (Slice) mObj; |