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

Merge "Attempt to unlink session file if hardlink fails" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-04 21:12:04 +00:00
committed by Android (Google) Code Review
parent cc87e369b8 dd7ffddb26
commit 7fbed032f6
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -1645,13 +1645,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
throw new SecurityException("link() can only be run by the system"); throw new SecurityException("link() can only be run by the system");
} }
try {
final File target = new File(path); final File target = new File(path);
final File source = new File(stageDir, target.getName()); final File source = new File(stageDir, target.getName());
var sourcePath = source.getAbsolutePath();
try { try {
Os.link(path, source.getAbsolutePath()); try {
Os.link(path, sourcePath);
// Grant READ access for APK to be read successfully // Grant READ access for APK to be read successfully
Os.chmod(source.getAbsolutePath(), 0644); Os.chmod(sourcePath, 0644);
} catch (ErrnoException e) { } catch (ErrnoException e) {
e.rethrowAsIOException(); e.rethrowAsIOException();
} }
@@ -1659,6 +1660,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
throw new IOException("Can't relabel file: " + source); throw new IOException("Can't relabel file: " + source);
} }
} catch (IOException e) { } catch (IOException e) {
try {
Os.unlink(sourcePath);
} catch (Exception ignored) {
Slog.d(TAG, "Failed to unlink session file: " + sourcePath);
}
throw ExceptionUtils.wrap(e); throw ExceptionUtils.wrap(e);
} }
} }