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

Commit 52dceb80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Nullable annoation for Location#setExtras."

parents cc8c3ba4 5675ee40

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -24036,7 +24036,7 @@ package android.location { 
    method public void setBearingAccuracyDegrees(float);

    method public void setElapsedRealtimeNanos(long);

    method public void setElapsedRealtimeUncertaintyNanos(double);

    method @Deprecated public void setExtras(android.os.Bundle);

    method @Deprecated public void setExtras(@Nullable android.os.Bundle);

    method public void setLatitude(double);

    method public void setLongitude(double);

    method public void setProvider(String);

location/java/android/location/Location.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.location; 
import static java.util.concurrent.TimeUnit.NANOSECONDS;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;
@@ -1066,7 +1067,7 @@ public class Location implements Parcelable { 
     * @deprecated Do not use.

     */

    @Deprecated

    public void setExtras(Bundle extras) {

    public void setExtras(@Nullable Bundle extras) {

        mExtras = (extras == null) ? null : new Bundle(extras);

    }