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

Commit b449fa50 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... 

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

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



Change-Id: Ic2bdc6222592e97a0c973faafb7c95ee838e38a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5c7bcf4 43fb7b6b

core/java/android/app/ComponentOptions.java

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

    public Bundle toBundle() {

        Bundle b = new Bundle();

        Bundle b = new Bundle();

        b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, mPendingIntentBalAllowed);

        b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, mPendingIntentBalAllowed);

        if (mPendingIntentBalAllowedByPermission) {

            b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION,

            b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION,

                    mPendingIntentBalAllowedByPermission);

                    mPendingIntentBalAllowedByPermission);

        }

        return b;

        return b;

    }

    }

}
 
}