diff options
author | Oscar Montemayor <oam@google.com> | 2009-11-18 10:14:20 -0800 |
---|---|---|
committer | Oscar Montemayor <oam@google.com> | 2009-11-24 11:44:19 -0800 |
commit | a8529f68671a8a118751cb6ad577f44eaf076b96 (patch) | |
tree | bf191767698261c9bdd7b599593f3177a188da7d /core/java/android/content/SyncStorageEngine.java | |
parent | 579d418db016a9ae87479da9e29d8827474d68f5 (diff) | |
download | frameworks_base-a8529f68671a8a118751cb6ad577f44eaf076b96.zip frameworks_base-a8529f68671a8a118751cb6ad577f44eaf076b96.tar.gz frameworks_base-a8529f68671a8a118751cb6ad577f44eaf076b96.tar.bz2 |
Encrypted File Systems Project. Installer modifications.
Started to modify isntaller for data redirection to a secure location.
Diffstat (limited to 'core/java/android/content/SyncStorageEngine.java')
-rw-r--r-- | core/java/android/content/SyncStorageEngine.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java index be70909..b6bb7db 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/core/java/android/content/SyncStorageEngine.java @@ -16,16 +16,11 @@ package android.content; -import com.android.internal.os.AtomicFile; -import com.android.internal.util.ArrayUtils; -import com.android.internal.util.FastXmlSerializer; - import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; import android.accounts.Account; -import android.backup.IBackupManager; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; @@ -37,11 +32,15 @@ import android.os.Message; import android.os.Parcel; import android.os.RemoteCallbackList; import android.os.RemoteException; -import android.os.ServiceManager; +import android.os.SystemProperties; import android.util.Log; import android.util.SparseArray; import android.util.Xml; +import com.android.internal.os.AtomicFile; +import com.android.internal.util.ArrayUtils; +import com.android.internal.util.FastXmlSerializer; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -258,7 +257,9 @@ public class SyncStorageEngine extends Handler { mCal = Calendar.getInstance(TimeZone.getTimeZone("GMT+0")); - File dataDir = Environment.getDataDirectory(); + // This call will return the correct directory whether Encrypted File Systems is + // enabled or not. + File dataDir = Environment.getSecureDataDirectory(); File systemDir = new File(dataDir, "system"); File syncDir = new File(systemDir, "sync"); mAccountInfoFile = new AtomicFile(new File(syncDir, "accounts.xml")); |