summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-04-24 16:10:32 -0700
committerJeff Sharkey <jsharkey@android.com>2015-04-24 18:01:45 -0700
commit275e3e43f2fba72fa99001cafa2a70e5478fc545 (patch)
treebe196ff698ba222c410d0666d430fa0ec5aa5ae4 /core/java/android/app
parentb423e300f77de90aea34321ef7f67882d4e526ed (diff)
downloadframeworks_base-275e3e43f2fba72fa99001cafa2a70e5478fc545.zip
frameworks_base-275e3e43f2fba72fa99001cafa2a70e5478fc545.tar.gz
frameworks_base-275e3e43f2fba72fa99001cafa2a70e5478fc545.tar.bz2
Migrate primary external storage.
Wire up through MountService to call down into vold. Watch for unsolicited events that report progress, including special value "82" that signals that copy has finished. We use this value to persist the volumeUuid in case of unexpected reboot, since it indicates the new volume is ready. Wire progress updates through existing callback pipeline. Update the volume mounting code to match against the persisted UUID when selecting the primary external storage. Bug: 19993667 Change-Id: Id46957610fb43517bbfbc368f29b7d430664590d
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/ApplicationPackageManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 10f5960..16a2430 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -1556,6 +1556,7 @@ final class ApplicationPackageManager extends PackageManager {
}
}
+ @Override
public @Nullable VolumeInfo getPrimaryStorageCurrentVolume() {
final StorageManager storage = mContext.getSystemService(StorageManager.class);
final String volumeUuid = storage.getPrimaryStorageUuid();
@@ -1568,6 +1569,7 @@ final class ApplicationPackageManager extends PackageManager {
}
}
+ @Override
public @NonNull List<VolumeInfo> getPrimaryStorageCandidateVolumes() {
final StorageManager storage = mContext.getSystemService(StorageManager.class);
final VolumeInfo currentVol = getPrimaryStorageCurrentVolume();