Merge "Fix crash in slices"

2017-11-29 21:25:59 +00:00
parent 918d002ac0 c10e0e2d19
commit aae9f84ce8
1 changed files with 1 additions and 1 deletions
--- 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;