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

am cd5d46ff: am 293f0f38: Merge "package_info GID shouldn\'t have write." into lmp-mr1-dev

Browse Source 
* commit 'cd5d46ff81ab652dc9dc9c28d607f536187f3bab':
  package_info GID shouldn't have write.
This commit is contained in:
Jeff Sharkey
2014-11-26 20:02:29 +00:00
committed by Android Git Automerger
parent fe27981326 cd5d46ff81
commit 06e8c58e7c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -648,7 +648,7 @@ public class PackageManagerService extends IPackageManager.Stub {
try { try {
f = file.startWrite(); f = file.startWrite();
BufferedOutputStream out = new BufferedOutputStream(f); BufferedOutputStream out = new BufferedOutputStream(f);
FileUtils.setPermissions(file.getBaseFile().getPath(), 0660, SYSTEM_UID, PACKAGE_INFO_GID); FileUtils.setPermissions(file.getBaseFile().getPath(), 0640, SYSTEM_UID, PACKAGE_INFO_GID);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (PackageParser.Package pkg : mPackages.values()) { for (PackageParser.Package pkg : mPackages.values()) {
if (pkg.mLastPackageUsageTimeInMills == 0) { if (pkg.mLastPackageUsageTimeInMills == 0) {

4
services/core/java/com/android/server/pm/Settings.java
View File

@@ -271,7 +271,7 @@ final class Settings {
mSettingsFilename = new File(mSystemDir, "packages.xml"); mSettingsFilename = new File(mSystemDir, "packages.xml");
mBackupSettingsFilename = new File(mSystemDir, "packages-backup.xml"); mBackupSettingsFilename = new File(mSystemDir, "packages-backup.xml");
mPackageListFilename = new File(mSystemDir, "packages.list"); mPackageListFilename = new File(mSystemDir, "packages.list");
FileUtils.setPermissions(mPackageListFilename, 0660, SYSTEM_UID, PACKAGE_INFO_GID); FileUtils.setPermissions(mPackageListFilename, 0640, SYSTEM_UID, PACKAGE_INFO_GID);
// Deprecated: Needed for migration // Deprecated: Needed for migration
mStoppedPackagesFilename = new File(mSystemDir, "packages-stopped.xml"); mStoppedPackagesFilename = new File(mSystemDir, "packages-stopped.xml");
@@ -1651,7 +1651,7 @@ final class Settings {
fstr = new FileOutputStream(writeTarget); fstr = new FileOutputStream(writeTarget);
str = new BufferedOutputStream(fstr); str = new BufferedOutputStream(fstr);
try { try {
FileUtils.setPermissions(fstr.getFD(), 0660, SYSTEM_UID, PACKAGE_INFO_GID); FileUtils.setPermissions(fstr.getFD(), 0640, SYSTEM_UID, PACKAGE_INFO_GID);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (final PackageSetting pkg : mPackages.values()) { for (final PackageSetting pkg : mPackages.values()) {