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

Commit d37d6616 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Add OBB size to PackageStats" into honeycomb

parents bee8ec25 bcd6c96e

api/11.xml

+40 −0
Original line number Diff line number Diff line
@@ -61562,6 +61562,46 @@ 
 visibility="public"

>

</field>

<field name="externalCacheSize"

 type="long"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="externalDataSize"

 type="long"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="externalMediaSize"

 type="long"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="externalObbSize"

 type="long"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="packageName"

 type="java.lang.String"

 transient="false"

api/current.xml

+21 −0
Original line number Diff line number Diff line
@@ -61592,6 +61592,16 @@ 
 visibility="public"

>

</field>

<field name="externalObbSize"

 type="long"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="packageName"

 type="java.lang.String"

 transient="false"
@@ -183903,6 +183913,17 @@ 
 visibility="public"

>

</method>

<method name="getObbDir"

 return="java.io.File"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getPackageCodePath"

 return="java.lang.String"

 abstract="false"

core/java/android/content/pm/PackageStats.java

+8 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ public class PackageStats implements Parcelable { 
    /** Size of the external media size used by the application. */

    public long externalMediaSize;



    /** Size of the package's OBBs placed on external media. */

    public long externalObbSize;



    public static final Parcelable.Creator<PackageStats> CREATOR

            = new Parcelable.Creator<PackageStats>() {

        public PackageStats createFromParcel(Parcel in) {
@@ -83,6 +86,8 @@ public class PackageStats implements Parcelable { 
        sb.append(externalCacheSize);

        sb.append(",externalMediaSize=");

        sb.append(externalMediaSize);

        sb.append(",externalObbSize=");

        sb.append(externalObbSize);

        return sb.toString();

    }
@@ -98,6 +103,7 @@ public class PackageStats implements Parcelable { 
        externalDataSize = source.readLong();

        externalCacheSize = source.readLong();

        externalMediaSize = source.readLong();

        externalObbSize = source.readLong();

    }



    public PackageStats(PackageStats pStats) {
@@ -108,6 +114,7 @@ public class PackageStats implements Parcelable { 
        externalDataSize = pStats.externalDataSize;

        externalCacheSize = pStats.externalCacheSize;

        externalMediaSize = pStats.externalMediaSize;

        externalObbSize = pStats.externalObbSize;

    }



    public int describeContents() {
@@ -122,5 +129,6 @@ public class PackageStats implements Parcelable { 
        dest.writeLong(externalDataSize);

        dest.writeLong(externalCacheSize);

        dest.writeLong(externalMediaSize);

        dest.writeLong(externalObbSize);

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -4853,6 +4853,11 @@ class PackageManagerService extends IPackageManager.Stub { 
                        .getExternalStorageAppMediaDirectory(mStats.packageName);

                mStats.externalMediaSize = mContainerService

                        .calculateDirectorySize(externalCacheDir.getPath());



                final File externalObbDir = Environment

                        .getExternalStorageAppObbDirectory(mStats.packageName);

                mStats.externalObbSize = mContainerService.calculateDirectorySize(externalObbDir

                        .getPath());

            }

        }