commit 19ef3fceabd5a127469f777842d723585b83d9fd
author Svetoslav Ganov <svetoslavganov@google.com> Mon May 01 23:00:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 01 23:00:25 2017 +0000
tree 2c20d0d955ce93fece47d8f811cf8d8299bd24e8
parent 6958495360b267a65178d56f9dc1b265042ae123
parent 58d3836914e2791c64e5a694d17d17f4e818add2

Merge "Addess API council comments" into oc-dev am: a9bb97993f
am: 58d3836914

Change-Id: I095d5c9a488db01bd3dcf6b3609aa4e928311ca9

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 6651be4..2ba78b3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10947,7 +10947,7 @@
     method public java.util.List<android.content.pm.VersionedPackage> getDependentPackages();
     method public java.lang.String getName();
     method public int getType();
-    method public long getVersion();
+    method public int getVersion();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.content.pm.SharedLibraryInfo> CREATOR;
     field public static final int TYPE_BUILTIN = 0; // 0x0

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index a095a32..1f209f1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11720,7 +11720,7 @@
     method public java.util.List<android.content.pm.VersionedPackage> getDependentPackages();
     method public java.lang.String getName();
     method public int getType();
-    method public long getVersion();
+    method public int getVersion();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.content.pm.SharedLibraryInfo> CREATOR;
     field public static final int TYPE_BUILTIN = 0; // 0x0

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 4a40406..a5fee26 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -10988,7 +10988,7 @@
     method public java.util.List<android.content.pm.VersionedPackage> getDependentPackages();
     method public java.lang.String getName();
     method public int getType();
-    method public long getVersion();
+    method public int getVersion();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.content.pm.SharedLibraryInfo> CREATOR;
     field public static final int TYPE_BUILTIN = 0; // 0x0

core/java/android/content/pm/SharedLibraryInfo.java

diff --git a/core/java/android/content/pm/SharedLibraryInfo.java b/core/java/android/content/pm/SharedLibraryInfo.java
index 0ad4874..5032e6a 100644
--- a/core/java/android/content/pm/SharedLibraryInfo.java
+++ b/core/java/android/content/pm/SharedLibraryInfo.java
@@ -131,7 +131,7 @@
      *
      * @return The version.
      */
-    public @IntRange(from = -1) long getVersion() {
+    public @IntRange(from = -1) int getVersion() {
         return mVersion;
     }
 

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index f173dbc..86ed623 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4361,8 +4361,7 @@
                     }
 
                     SharedLibraryInfo resLibInfo = new SharedLibraryInfo(libInfo.getName(),
-                            // TODO: Remove cast for lib version once internally we support longs.
-                            (int) libInfo.getVersion(), libInfo.getType(),
+                            libInfo.getVersion(), libInfo.getType(),
                             libInfo.getDeclaringPackage(), getPackagesUsingSharedLibraryLPr(libInfo,
                             flags, userId));
 
@@ -17776,8 +17775,7 @@
         for (int i = 0; i < versionCount; i++) {
             SharedLibraryEntry libEntry = versionedLib.valueAt(i);
             if (versionsCallerCanSee != null && versionsCallerCanSee.indexOfKey(
-                    // TODO: Remove cast for lib version once internally we support longs.
-                    (int) libEntry.info.getVersion()) < 0) {
+                    libEntry.info.getVersion()) < 0) {
                 continue;
             }
             // TODO: We will change version code to long, so in the new API it is long