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

TIF: Change the directory of the state file

Browse Source 
Changed it from /data/system/tv/{userId} to the directory obtained from
Environment.getUserSystemDirectory(userId).

Bug: 17018435
Change-Id: Ib9704a974c4397149ca4b50670cf11346b818de3
This commit is contained in:
Jae Seo
2014-08-14 10:49:33 -07:00
parent 82324ec662
commit 8211dda34d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/tv/PersistentDataStore.java
View File

@@ -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() {