Merge "Address API council comments" into oc-dev

5 files changed, 16 insertions, 11 deletions

diff --git a/api/current.txt b/api/current.txt
index bb083f1188ed..e9045c0f8e5c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11040,7 +11040,7 @@ package android.content.pm {
     ctor public VersionedPackage(java.lang.String, int);
     method public int describeContents();
     method public java.lang.String getPackageName();
-    method public long getVersionCode();
+    method public int getVersionCode();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.content.pm.VersionedPackage> CREATOR;
   }
@@ -47752,7 +47752,7 @@ package android.view.autofill {
   public final class AutofillManager {
     method public void cancel();
     method public void commit();
-    method public void disableOwnedAutofillServices();
+    method public void disableAutofillServices();
     method public boolean hasEnabledAutofillServices();
     method public boolean isAutofillSupported();
     method public boolean isEnabled();
diff --git a/api/system-current.txt b/api/system-current.txt
index 5bb85be9801f..cf9228c7f709 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11806,7 +11806,7 @@ package android.content.pm {
     ctor public VersionedPackage(java.lang.String, int);
     method public int describeContents();
     method public java.lang.String getPackageName();
-    method public long getVersionCode();
+    method public int getVersionCode();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.content.pm.VersionedPackage> CREATOR;
   }
@@ -51348,7 +51348,7 @@ package android.view.autofill {
   public final class AutofillManager {
     method public void cancel();
     method public void commit();
-    method public void disableOwnedAutofillServices();
+    method public void disableAutofillServices();
     method public boolean hasEnabledAutofillServices();
     method public boolean isAutofillSupported();
     method public boolean isEnabled();
diff --git a/api/test-current.txt b/api/test-current.txt
index c39e490dce5b..3b82fddc8691 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -11082,7 +11082,7 @@ package android.content.pm {
     ctor public VersionedPackage(java.lang.String, int);
     method public int describeContents();
     method public java.lang.String getPackageName();
-    method public long getVersionCode();
+    method public int getVersionCode();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.content.pm.VersionedPackage> CREATOR;
   }
@@ -48131,7 +48131,7 @@ package android.view.autofill {
   public final class AutofillManager {
     method public void cancel();
     method public void commit();
-    method public void disableOwnedAutofillServices();
+    method public void disableAutofillServices();
     method public boolean hasEnabledAutofillServices();
     method public boolean isAutofillSupported();
     method public boolean isEnabled();
diff --git a/core/java/android/content/pm/VersionedPackage.java b/core/java/android/content/pm/VersionedPackage.java
index 83e78152862e..29c5efe7c77a 100644
--- a/core/java/android/content/pm/VersionedPackage.java
+++ b/core/java/android/content/pm/VersionedPackage.java
@@ -28,7 +28,7 @@ import java.lang.annotation.RetentionPolicy;
  */
 public final class VersionedPackage implements Parcelable {
     private final String mPackageName;
-    private final long mVersionCode;
+    private final int mVersionCode;
 
     /** @hide */
     @Retention(RetentionPolicy.SOURCE)
@@ -49,7 +49,7 @@ public final class VersionedPackage implements Parcelable {
 
     private VersionedPackage(Parcel parcel) {
         mPackageName = parcel.readString();
-        mVersionCode = parcel.readLong();
+        mVersionCode = parcel.readInt();
     }
 
     /**
@@ -66,7 +66,7 @@ public final class VersionedPackage implements Parcelable {
      *
      * @return The version code.
      */
-    public @VersionCode long getVersionCode() {
+    public @VersionCode int getVersionCode() {
         return mVersionCode;
     }
 
@@ -83,7 +83,7 @@ public final class VersionedPackage implements Parcelable {
     @Override
     public void writeToParcel(Parcel parcel, int flags) {
         parcel.writeString(mPackageName);
-        parcel.writeLong(mVersionCode);
+        parcel.writeInt(mVersionCode);
     }
 
     public static final Creator<VersionedPackage> CREATOR = new Creator<VersionedPackage>() {
diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java
index 94ca562cedc8..0a24bfb019ca 100644
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -630,11 +630,16 @@ public final class AutofillManager {
         }
     }
 
+    /** @hide */
+    public void disableOwnedAutofillServices() {
+        disableAutofillServices();
+    }
+
     /**
      * If the app calling this API has enabled autofill services they
      * will be disabled.
      */
-    public void disableOwnedAutofillServices() {
+    public void disableAutofillServices() {
         if (!hasAutofillFeature()) {
             return;
         }