commit 8212ae0aee1700b9c287ebadf15af8dacdc8eae6
author Jeff Sharkey <jsharkey@android.com> Wed Feb 10 14:46:43 2016 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Feb 10 15:03:33 2016 -0700
tree b5a32363add3e457bdcbf90e5b9b4057a23a9202
parent ee4ce4233cacc36937e52abc385ee0f8e5efecd8

Consistent naming for internal storage APIs.

Also completely remove a few confusingly named deprecated APIs.

Change-Id: Ia7e4ea3190a97f0a7dfa9bebf2118da0866ec38f

services/core/java/com/android/server/content/SyncStorageEngine.java

diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java
index f8e3e48..965054f 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -438,9 +438,7 @@
         if (sSyncStorageEngine != null) {
             return;
         }
-        // This call will return the correct directory whether Encrypted File Systems is
-        // enabled or not.
-        File dataDir = Environment.getSecureDataDirectory();
+        File dataDir = Environment.getDataDirectory();
         sSyncStorageEngine = new SyncStorageEngine(context, dataDir);
     }