diff options
author | Jeff Sharkey <jsharkey@android.com> | 2015-04-18 20:23:13 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2015-04-18 21:11:58 -0700 |
commit | 529f91fc8e7e884ef19bef8eb3e4e3a1d69336f4 (patch) | |
tree | 463b7b5d9175e98402939a2bbfebd4f30899feac /core/java/android/content | |
parent | 355df8f16ae4c428997d88ba86f1ce07e5eca35e (diff) | |
download | frameworks_base-529f91fc8e7e884ef19bef8eb3e4e3a1d69336f4.zip frameworks_base-529f91fc8e7e884ef19bef8eb3e4e3a1d69336f4.tar.gz frameworks_base-529f91fc8e7e884ef19bef8eb3e4e3a1d69336f4.tar.bz2 |
Always send volume UUID with installd commands.
Since packages can be moved to other volumes, all relevant commands
to installd now require an explicit volume UUID parameter.
Bug: 20275577
Change-Id: Ie84f5bc43c7aada5800b8d71692c7928b42b965e
Diffstat (limited to 'core/java/android/content')
-rw-r--r-- | core/java/android/content/pm/IPackageManager.aidl | 4 | ||||
-rw-r--r-- | core/java/android/content/pm/PackageManager.java | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index c2580c0..447c668 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -328,7 +328,7 @@ interface IPackageManager { * @param observer call back used to notify when * the operation is completed */ - void freeStorageAndNotify(in long freeStorageSize, + void freeStorageAndNotify(in String volumeUuid, in long freeStorageSize, IPackageDataObserver observer); /** @@ -352,7 +352,7 @@ interface IPackageManager { * notify when the operation is completed.May be null * to indicate that no call back is desired. */ - void freeStorage(in long freeStorageSize, + void freeStorage(in String volumeUuid, in long freeStorageSize, in IntentSender pi); /** diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a128872..a0cec50 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3798,7 +3798,13 @@ public abstract class PackageManager { * @hide */ // @SystemApi - public abstract void freeStorageAndNotify(long freeStorageSize, IPackageDataObserver observer); + public void freeStorageAndNotify(long freeStorageSize, IPackageDataObserver observer) { + freeStorageAndNotify(null, freeStorageSize, observer); + } + + /** {@hide} */ + public abstract void freeStorageAndNotify(String volumeUuid, long freeStorageSize, + IPackageDataObserver observer); /** * Free storage by deleting LRU sorted list of cache files across @@ -3823,7 +3829,12 @@ public abstract class PackageManager { * * @hide */ - public abstract void freeStorage(long freeStorageSize, IntentSender pi); + public void freeStorage(long freeStorageSize, IntentSender pi) { + freeStorage(null, freeStorageSize, pi); + } + + /** {@hide} */ + public abstract void freeStorage(String volumeUuid, long freeStorageSize, IntentSender pi); /** * Retrieve the size information for a package. |