diff options
Diffstat (limited to 'core')
4 files changed, 0 insertions, 209 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index b64069d..079d4cf 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -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; diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 28e1a63..034525e 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -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); } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 47418aa..6e9cdbe 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -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); } diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java index 2126529..0e65df5 100755 --- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java @@ -48,7 +48,6 @@ import android.util.Log; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; public class PackageManagerTests extends AndroidTestCase { private static final boolean localLOGV = true; @@ -3106,164 +3105,6 @@ public class PackageManagerTests extends AndroidTestCase { PackageInfo.INSTALL_LOCATION_UNSPECIFIED); } - @LargeTest - public void testPackageObbPaths_Nonexistent() { - try { - final PackageManager pm = getPm(); - - // Invalid Java package name. - pm.getPackageObbPaths("=non-existent"); - - fail("Should not be able to get package OBB paths for non-existent package"); - } catch (IllegalArgumentException e) { - // pass - } - } - - @LargeTest - public void testPackageObbPaths_Initial() { - InstallParams ip = sampleInstallFromRawResource(PackageManager.INSTALL_INTERNAL, false); - - try { - final PackageManager pm = getPm(); - - assertEquals("Initial obb paths should be null", - null, pm.getPackageObbPaths(ip.pkg.packageName)); - } finally { - cleanUpInstall(ip); - } - } - - @LargeTest - public void testPackageObbPaths_Null() { - InstallParams ip = sampleInstallFromRawResource(PackageManager.INSTALL_INTERNAL, false); - - try { - final PackageManager pm = getPm(); - - pm.setPackageObbPaths(ip.pkg.packageName, null); - - assertEquals("Returned paths should be null", - null, pm.getPackageObbPaths(ip.pkg.packageName)); - } finally { - cleanUpInstall(ip); - } - } - - @LargeTest - public void testPackageObbPaths_Empty() { - InstallParams ip = sampleInstallFromRawResource(PackageManager.INSTALL_INTERNAL, false); - - try { - final PackageManager pm = getPm(); - - final String[] paths = new String[0]; - - pm.setPackageObbPaths(ip.pkg.packageName, paths); - - assertEquals("Empty list should be interpreted as null", - null, pm.getPackageObbPaths(ip.pkg.packageName)); - } finally { - cleanUpInstall(ip); - } - } - - @LargeTest - public void testPackageObbPaths_Single() { - InstallParams ip = sampleInstallFromRawResource(PackageManager.INSTALL_INTERNAL, false); - - try { - final PackageManager pm = getPm(); - - final String[] paths = new String[] { - "/example/test", - }; - - pm.setPackageObbPaths(ip.pkg.packageName, paths.clone()); - - assertTrue("Previously set paths should be the same as the returned paths.", - Arrays.equals(paths, pm.getPackageObbPaths(ip.pkg.packageName))); - } finally { - cleanUpInstall(ip); - } - } - - @LargeTest - public void testPackageObbPaths_Multiple() { - InstallParams ip = sampleInstallFromRawResource(PackageManager.INSTALL_INTERNAL, false); - - try { - final PackageManager pm = getPm(); - - final String[] paths = new String[] { - "/example/test1", - "/example/test2", - }; - - pm.setPackageObbPaths(ip.pkg.packageName, paths.clone()); - - assertTrue("Previously set paths should be the same as the returned paths.", - Arrays.equals(paths, pm.getPackageObbPaths(ip.pkg.packageName))); - } finally { - cleanUpInstall(ip); - } - } - - @LargeTest - public void testPackageObbPaths_Twice() { - InstallParams ip = sampleInstallFromRawResource(PackageManager.INSTALL_INTERNAL, false); - - try { - final PackageManager pm = getPm(); - - final String[] paths = new String[] { - "/example/test1", - "/example/test2", - }; - - pm.setPackageObbPaths(ip.pkg.packageName, paths.clone()); - - assertTrue("Previously set paths should be the same as the returned paths.", - Arrays.equals(paths, pm.getPackageObbPaths(ip.pkg.packageName))); - - paths[0] = "/example/test3"; - pm.setPackageObbPaths(ip.pkg.packageName, paths.clone()); - - assertTrue("Previously set paths should be the same as the returned paths.", - Arrays.equals(paths, pm.getPackageObbPaths(ip.pkg.packageName))); - } finally { - cleanUpInstall(ip); - } - } - - @LargeTest - public void testPackageObbPaths_ReplacePackage() { - InstallParams ip = sampleInstallFromRawResource(PackageManager.INSTALL_INTERNAL, false); - - try { - final PackageManager pm = getPm(); - - final String[] paths = new String[] { - "/example/test1", - "/example/test2", - }; - - pm.setPackageObbPaths(ip.pkg.packageName, paths.clone()); - - Log.i(TAG, "Creating replaceReceiver"); - final GenericReceiver receiver = new ReplaceReceiver(ip.pkg.packageName); - - final int flags = PackageManager.INSTALL_REPLACE_EXISTING; - invokeInstallPackage(ip.packageURI, flags, receiver); - assertInstall(ip.pkg, flags, ip.pkg.installLocation); - - assertTrue("Previously set paths should be the same as the returned paths.", - Arrays.equals(paths, pm.getPackageObbPaths(ip.pkg.packageName))); - } finally { - cleanUpInstall(ip); - } - } - /*---------- Recommended install location tests ----*/ /* * TODO's |