From 8211dda34da967ca1801bb817e0bfc7c3c87863c Mon Sep 17 00:00:00 2001 From: Jae Seo Date: Thu, 14 Aug 2014 10:49:33 -0700 Subject: TIF: Change the directory of the state file Changed it from /data/system/tv/{userId} to the directory obtained from Environment.getUserSystemDirectory(userId). Bug: 17018435 Change-Id: Ib9704a974c4397149ca4b50670cf11346b818de3 --- .../core/java/com/android/server/tv/PersistentDataStore.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'services/core') diff --git a/services/core/java/com/android/server/tv/PersistentDataStore.java b/services/core/java/com/android/server/tv/PersistentDataStore.java index ed0de03..05a2bde 100644 --- a/services/core/java/com/android/server/tv/PersistentDataStore.java +++ b/services/core/java/com/android/server/tv/PersistentDataStore.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.Intent; import android.media.tv.TvContentRating; import android.media.tv.TvInputManager; +import android.os.Environment; import android.os.Handler; import android.os.UserHandle; import android.text.TextUtils; @@ -81,9 +82,13 @@ final class PersistentDataStore { public PersistentDataStore(Context context, int userId) { mContext = context; - File tvDir = new File("/data/system/tv/" + userId); - tvDir.mkdirs(); - mAtomicFile = new AtomicFile(new File(tvDir, "tv-input-manager-state.xml")); + File userDir = Environment.getUserSystemDirectory(userId); + if (!userDir.exists()) { + if (!userDir.mkdirs()) { + throw new IllegalStateException("User dir cannot be created: " + userDir); + } + } + mAtomicFile = new AtomicFile(new File(userDir, "tv-input-manager-state.xml")); } public boolean isParentalControlsEnabled() { -- cgit v1.1