Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19ef3fce authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Addess API council comments" into oc-dev am: a9bb9799 

am: 58d38369

Change-Id: I095d5c9a488db01bd3dcf6b3609aa4e928311ca9
parents 69584953 58d38369

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10947,7 +10947,7 @@ package android.content.pm { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -11720,7 +11720,7 @@ package android.content.pm { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -10988,7 +10988,7 @@ package android.content.pm { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public final class SharedLibraryInfo implements Parcelable { 
     *

     * @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

+2 −4
Original line number Diff line number Diff line
@@ -4361,8 +4361,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                    }















                    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 @@ public class PackageManagerService extends IPackageManager.Stub













        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