From d21cad13a6d77294f3d0181a3bc5e26af2fc0f7f Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 20 May 2016 11:30:07 -0600
Subject: [PATCH] API council feedback: hide and document.

Hide isMetered() and clarify moveDatabaseFrom() docs.

Bug: 28870582, 28775585
Change-Id: Iabe63045c39ce7f662488f4224b56387c3c59519
---
 api/current.txt                        | 1 -
 api/system-current.txt                 | 1 -
 api/test-current.txt                   | 1 -
 core/java/android/content/Context.java | 2 ++
 core/java/android/net/NetworkInfo.java | 1 +
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 17182dbde4ced..e028d59db7bb4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23620,7 +23620,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;
diff --git a/api/system-current.txt b/api/system-current.txt
index 9bccb9ebc8371..da91019e9c50e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -25442,7 +25442,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;
diff --git a/api/test-current.txt b/api/test-current.txt
index 13a96e013670a..5c2b1ad86d7e3 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -23689,7 +23689,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;
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index a43d06ed5ae0d..b7588687a8e42 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -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.
diff --git a/core/java/android/net/NetworkInfo.java b/core/java/android/net/NetworkInfo.java
index b6c5c6fa966f8..42f5feb583394 100644
--- a/core/java/android/net/NetworkInfo.java
+++ b/core/java/android/net/NetworkInfo.java
@@ -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) {