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

Commit b3af535a authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of 816cff12 to master 

Change-Id: I33990232771138dcf91f55c7cde6bbfe40612b8f
parents 71b676bc 816cff12

core/java/android/os/Bundle.java

+4 −2
Original line number Diff line number Diff line
@@ -692,10 +692,12 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { 


    /**

     * Returns the value associated with the given key, or defaultValue if

     * no mapping of the desired type exists for the given key.

     * no mapping of the desired type exists for the given key or if a null

     * value is explicitly associatd with the given key.

     *

     * @param key a String, or null

     * @param defaultValue Value to return if key does not exist

     * @param defaultValue Value to return if key does not exist or if a null

     *     value is associated with the given key.

     * @return the CharSequence value associated with the given key, or defaultValue

     *     if no valid CharSequence object is currently mapped to that key.

     */