Merge "Add @TestApi to Configuration.assetsSeq"

2019-01-09 12:38:15 +00:00
parent d8d847cbae e716d72d40
commit 6af7667961
2 changed files with 2 additions and 0 deletions
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -394,6 +394,7 @@ package android.content.pm {
 package android.content.res {

  public final class Configuration implements java.lang.Comparable android.os.Parcelable {
+    field public int assetsSeq;
    field public final android.app.WindowConfiguration windowConfiguration;
  }

--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -794,6 +794,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
     * {@link ActivityInfo#CONFIG_ASSETS_PATHS}.
     * @hide
     */
+    @TestApi
    public int assetsSeq;

    /**