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

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

Merge "API council feedback: hide and document." into nyc-dev

parents b6f64060 d21cad13

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -23626,7 +23626,6 @@ package android.net { 
    method public boolean isConnected();

    method public boolean isConnectedOrConnecting();

    method public boolean isFailover();

    method public boolean isMetered();

    method public boolean isRoaming();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -25448,7 +25448,6 @@ package android.net { 
    method public boolean isConnected();

    method public boolean isConnectedOrConnecting();

    method public boolean isFailover();

    method public boolean isMetered();

    method public boolean isRoaming();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -23695,7 +23695,6 @@ package android.net { 
    method public boolean isConnected();

    method public boolean isConnectedOrConnecting();

    method public boolean isFailover();

    method public boolean isMetered();

    method public boolean isRoaming();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;

core/java/android/content/Context.java

+2 −0
Original line number Diff line number Diff line
@@ -1415,6 +1415,8 @@ public abstract class Context { 
     * this context. This is typically used to migrate data between storage

     * locations after an upgrade, such as migrating to device protected

     * storage.

     * <p>

     * The database must be closed before being moved.

     *

     * @param sourceContext The source context which contains the existing

     *            database to move.

core/java/android/net/NetworkInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ public class NetworkInfo implements Parcelable { 
     *

     * @return {@code true} if large transfers should be avoided, otherwise

     *         {@code false}.

     * @hide

     */

    public boolean isMetered() {

        synchronized (this) {