Merge "Only add boolean extra to bundle when the value is false" into tm-dev am: 76f37a5d74 am: 43fb7b6be4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18628215 Change-Id: Ic2bdc6222592e97a0c973faafb7c95ee838e38a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -99,8 +99,10 @@ public class ComponentOptions {
|
||||
public Bundle toBundle() {
|
||||
Bundle b = new Bundle();
|
||||
b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, mPendingIntentBalAllowed);
|
||||
b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION,
|
||||
mPendingIntentBalAllowedByPermission);
|
||||
if (mPendingIntentBalAllowedByPermission) {
|
||||
b.putBoolean(KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED_BY_PERMISSION,
|
||||
mPendingIntentBalAllowedByPermission);
|
||||
}
|
||||
return b;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user