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

Commit 43fb7b6b authored by Ricky Wai's avatar Ricky Wai Committed by Automerger Merge Worker
Browse files

Merge "Only add boolean extra to bundle when the value is false" into tm-dev am: 76f37a5d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18628215



Change-Id: I0beb4a6bcce2d1164970c01c18e2c14b83fa70dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c19f57ce 76f37a5d

core/java/android/app/ComponentOptions.java

+4 −2
Original line number Diff line number Diff line
@@ -99,8 +99,10 @@ public class ComponentOptions { 
    public Bundle toBundle() {

        Bundle b = new Bundle();

        b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, mPendingIntentBalAllowed);

        if (mPendingIntentBalAllowedByPermission) {

            b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION,

                    mPendingIntentBalAllowedByPermission);

        }

        return b;

    }

}