diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-12 15:39:41 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-05-12 15:39:41 -0700 |
| commit | 3d0724dc220a2e027b9e38f61c39c84c28a505d5 (patch) | |
| tree | d0bb402a46c3de05da7f086c629b78c3b175b3ba /services/java/com/android/server/pm/Settings.java | |
| parent | 674b595fa5299d138e068b2b786027d6d6225394 (diff) | |
| parent | 0e59729b104e48c7d935026f565c4b45f1f37d12 (diff) | |
| download | frameworks_base-3d0724dc220a2e027b9e38f61c39c84c28a505d5.zip frameworks_base-3d0724dc220a2e027b9e38f61c39c84c28a505d5.tar.gz frameworks_base-3d0724dc220a2e027b9e38f61c39c84c28a505d5.tar.bz2 | |
resolved conflicts for merge of 0e59729b to master
Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b
Diffstat (limited to 'services/java/com/android/server/pm/Settings.java')
| -rw-r--r-- | services/java/com/android/server/pm/Settings.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index 16b55c3..2720bf8 100644 --- a/services/java/com/android/server/pm/Settings.java +++ b/services/java/com/android/server/pm/Settings.java @@ -142,18 +142,11 @@ final class Settings { Settings() { File dataDir = Environment.getDataDirectory(); File systemDir = new File(dataDir, "system"); - // TODO(oam): This secure dir creation needs to be moved somewhere else (later) - File systemSecureDir = new File(dataDir, "secure/system"); systemDir.mkdirs(); - systemSecureDir.mkdirs(); FileUtils.setPermissions(systemDir.toString(), FileUtils.S_IRWXU|FileUtils.S_IRWXG |FileUtils.S_IROTH|FileUtils.S_IXOTH, -1, -1); - FileUtils.setPermissions(systemSecureDir.toString(), - FileUtils.S_IRWXU|FileUtils.S_IRWXG - |FileUtils.S_IROTH|FileUtils.S_IXOTH, - -1, -1); mSettingsFilename = new File(systemDir, "packages.xml"); mBackupSettingsFilename = new File(systemDir, "packages-backup.xml"); mPackageListFilename = new File(systemDir, "packages.list"); |