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

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

Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb

parents 2c12c708 a1cbb94d

api/11.xml

+0 −56
Original line number Diff line number Diff line
@@ -60298,19 +60298,6 @@ 
<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException">

</exception>

</method>

<method name="getPackageObbPaths"

 return="java.lang.String[]"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

</method>

<method name="getPackagesForUid"

 return="java.lang.String[]"

 abstract="true"
@@ -60797,21 +60784,6 @@ 
<parameter name="installerPackageName" type="java.lang.String">

</parameter>

</method>

<method name="setPackageObbPaths"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

<parameter name="paths" type="java.lang.String[]">

</parameter>

</method>

<field name="COMPONENT_ENABLED_STATE_DEFAULT"

 type="int"

 transient="false"
@@ -185371,19 +185343,6 @@ 
<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException">

</exception>

</method>

<method name="getPackageObbPaths"

 return="java.lang.String[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

</method>

<method name="getPackagesForUid"

 return="java.lang.String[]"

 abstract="false"
@@ -185883,21 +185842,6 @@ 
<parameter name="path" type="java.lang.String">

</parameter>

</method>

<method name="setPackageObbPaths"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

<parameter name="paths" type="java.lang.String[]">

</parameter>

</method>

</class>

<class name="MockResources"

 extends="android.content.res.Resources"

api/current.xml

+0 −56
Original line number Diff line number Diff line
@@ -60298,19 +60298,6 @@ 
<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException">

</exception>

</method>

<method name="getPackageObbPaths"

 return="java.lang.String[]"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

</method>

<method name="getPackagesForUid"

 return="java.lang.String[]"

 abstract="true"
@@ -60797,21 +60784,6 @@ 
<parameter name="installerPackageName" type="java.lang.String">

</parameter>

</method>

<method name="setPackageObbPaths"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

<parameter name="paths" type="java.lang.String[]">

</parameter>

</method>

<field name="COMPONENT_ENABLED_STATE_DEFAULT"

 type="int"

 transient="false"
@@ -185371,19 +185343,6 @@ 
<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException">

</exception>

</method>

<method name="getPackageObbPaths"

 return="java.lang.String[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

</method>

<method name="getPackagesForUid"

 return="java.lang.String[]"

 abstract="false"
@@ -185883,21 +185842,6 @@ 
<parameter name="path" type="java.lang.String">

</parameter>

</method>

<method name="setPackageObbPaths"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

<parameter name="paths" type="java.lang.String[]">

</parameter>

</method>

</class>

<class name="MockResources"

 extends="android.content.res.Resources"

core/java/android/app/ApplicationPackageManager.java

+0 −19
Original line number Diff line number Diff line
@@ -1103,25 +1103,6 @@ final class ApplicationPackageManager extends PackageManager { 
        return PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;

    }



    @Override

    public void setPackageObbPaths(String packageName, String[] paths) {

        try {

            mPM.setPackageObbPaths(packageName, paths);

        } catch (RemoteException e) {

            // Should never happen!

        }

    }



    @Override

    public String[] getPackageObbPaths(String packageName) {

        try {

            return mPM.getPackageObbPaths(packageName);

        } catch (RemoteException e) {

            // Should never happen!

        }

        return null;

    }



    private final ContextImpl mContext;

    private final IPackageManager mPM;

core/java/android/content/pm/IPackageManager.aidl

+0 −3
Original line number Diff line number Diff line
@@ -323,7 +323,4 @@ interface IPackageManager { 


    boolean setInstallLocation(int loc);

    int getInstallLocation();



    void setPackageObbPaths(in String packageName, in String[] paths);

    String[] getPackageObbPaths(in String packageName);

}

core/java/android/content/pm/PackageManager.java

+0 −28
Original line number Diff line number Diff line
@@ -2289,32 +2289,4 @@ public abstract class PackageManager { 
     */

    public abstract void movePackage(

            String packageName, IPackageMoveObserver observer, int flags);



    /**

     * Sets the Opaque Binary Blob (OBB) file path associated with a package

     * name. The caller must have the

     * {@link android.Manifest.permission#INSTALL_PACKAGES} permission.

     * <p>

     * NOTE: The existence or format of this file is not currently checked, but

     * it may be in the future.

     * 

     * @param packageName Name of the package with which to associate the .obb

     *            file.

     * @param paths Arrays of paths on the filesystem to the .obb files

     *            associated with the package.

     * @see #getPackageObbPaths(String)

     */

    public abstract void setPackageObbPaths(String packageName, String[] paths);



    /**

     * Gets the Opaque Binary Blob (OBB) file path associated with the package.

     * The caller must be the owner of the package queried or have the

     * {@link android.Manifest.permission#INSTALL_PACKAGES} permission.

     * 

     * @param packageName Name of the package with which to associate the .obb

     *            file.

     * @return array of paths to .obb files associated with the package

     * @see #setPackageObbPaths(String, String[])

     */

    public abstract String[] getPackageObbPaths(String packageName);

}