Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-25 20:43:55 +00:00
committed by Android (Google) Code Review
parent b6f640607b d21cad13a6
commit dfe232c763
5 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -23626,7 +23626,6 @@ package android.net {
method public boolean isConnected(); method public boolean isConnected();
method public boolean isConnectedOrConnecting(); method public boolean isConnectedOrConnecting();
method public boolean isFailover(); method public boolean isFailover();
method public boolean isMetered();
method public boolean isRoaming(); method public boolean isRoaming();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR; field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;

1
api/system-current.txt
View File

@@ -25448,7 +25448,6 @@ package android.net {
method public boolean isConnected(); method public boolean isConnected();
method public boolean isConnectedOrConnecting(); method public boolean isConnectedOrConnecting();
method public boolean isFailover(); method public boolean isFailover();
method public boolean isMetered();
method public boolean isRoaming(); method public boolean isRoaming();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR; field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;

1
api/test-current.txt
View File

@@ -23695,7 +23695,6 @@ package android.net {
method public boolean isConnected(); method public boolean isConnected();
method public boolean isConnectedOrConnecting(); method public boolean isConnectedOrConnecting();
method public boolean isFailover(); method public boolean isFailover();
method public boolean isMetered();
method public boolean isRoaming(); method public boolean isRoaming();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR; field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;

2
core/java/android/content/Context.java
View File

@@ -1415,6 +1415,8 @@ public abstract class Context {
* this context. This is typically used to migrate data between storage * this context. This is typically used to migrate data between storage
* locations after an upgrade, such as migrating to device protected * locations after an upgrade, such as migrating to device protected
* storage. * storage.
* <p>
* The database must be closed before being moved.
* *
* @param sourceContext The source context which contains the existing * @param sourceContext The source context which contains the existing
* database to move. * database to move.

1
core/java/android/net/NetworkInfo.java
View File

@@ -334,6 +334,7 @@ public class NetworkInfo implements Parcelable {
* *
* @return {@code true} if large transfers should be avoided, otherwise * @return {@code true} if large transfers should be avoided, otherwise
* {@code false}. * {@code false}.
* @hide
*/ */
public boolean isMetered() { public boolean isMetered() {
synchronized (this) { synchronized (this) {