Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don\'t evict SharedPreferences when migrate no-op." into nyc-dev

Browse Source 
am: 19c7699309

* commit '19c7699309f7aa6ce487a8db353ea24acf94c4ca':
  Don't evict SharedPreferences when migrate no-op.
This commit is contained in:
Jeff Sharkey
2016-03-02 02:02:05 +00:00
committed by android-build-merger
parent a4681f0300 19c7699309
commit e37ee97871
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/java/android/app/ContextImpl.java
View File

@@ -396,9 +396,11 @@ class ContextImpl extends Context {
/** /**
* Try our best to migrate all files from source to target that match * Try our best to migrate all files from source to target that match
* requested prefix. Return false if we have any trouble migrating. * requested prefix.
*
* @return the number of files moved, or -1 if there was trouble.
*/ */
private static boolean migrateFiles(File sourceDir, File targetDir, final String prefix) { private static int migrateFiles(File sourceDir, File targetDir, final String prefix) {
final File[] sourceFiles = FileUtils.listFilesOrEmpty(sourceDir, new FilenameFilter() { final File[] sourceFiles = FileUtils.listFilesOrEmpty(sourceDir, new FilenameFilter() {
@Override @Override
public boolean accept(File dir, String name) { public boolean accept(File dir, String name) {
@@ -406,7 +408,7 @@ class ContextImpl extends Context {
} }
}); });
boolean res = true; int res = 0;
for (File sourceFile : sourceFiles) { for (File sourceFile : sourceFiles) {
final File targetFile = new File(targetDir, sourceFile.getName()); final File targetFile = new File(targetDir, sourceFile.getName());
Log.d(TAG, "Migrating " + sourceFile + " to " + targetFile); Log.d(TAG, "Migrating " + sourceFile + " to " + targetFile);
@@ -416,9 +418,12 @@ class ContextImpl extends Context {
if (!sourceFile.delete()) { if (!sourceFile.delete()) {
throw new IOException("Failed to clean up " + sourceFile); throw new IOException("Failed to clean up " + sourceFile);
} }
if (res != -1) {
res++;
}
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Failed to migrate " + sourceFile + ": " + e); Log.w(TAG, "Failed to migrate " + sourceFile + ": " + e);
res = false; res = -1;
} }
} }
return res; return res;
@@ -430,12 +435,17 @@ class ContextImpl extends Context {
final File source = sourceContext.getSharedPreferencesPath(name); final File source = sourceContext.getSharedPreferencesPath(name);
final File target = getSharedPreferencesPath(name); final File target = getSharedPreferencesPath(name);
// Evict any in-memory caches for either location final int res = migrateFiles(source.getParentFile(), target.getParentFile(),
final ArrayMap<File, SharedPreferencesImpl> cache = getSharedPreferencesCacheLocked(); source.getName());
cache.remove(source); if (res > 0) {
cache.remove(target); // We moved at least one file, so evict any in-memory caches for
// either location
return migrateFiles(source.getParentFile(), target.getParentFile(), source.getName()); final ArrayMap<File, SharedPreferencesImpl> cache =
getSharedPreferencesCacheLocked();
cache.remove(source);
cache.remove(target);
}
return res != -1;
} }
} }
@@ -675,7 +685,8 @@ class ContextImpl extends Context {
synchronized (ContextImpl.class) { synchronized (ContextImpl.class) {
final File source = sourceContext.getDatabasePath(name); final File source = sourceContext.getDatabasePath(name);
final File target = getDatabasePath(name); final File target = getDatabasePath(name);
return migrateFiles(source.getParentFile(), target.getParentFile(), source.getName()); return migrateFiles(source.getParentFile(), target.getParentFile(),
source.getName()) != -1;
} }
} }