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

Merge "allocateSpaceForUpdate: clear calling identity before calling into apexd." into sc-dev

Browse Source
This commit is contained in:
Nikita Ioffe
2021-06-22 11:55:55 +00:00
committed by Android (Google) Code Review
parent 410dd5be58 8f0fa02c30
commit 4db95cceb9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/recoverysystem/RecoverySystemService.java
View File

@@ -961,11 +961,13 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo
@Override @Override
public boolean allocateSpaceForUpdate(String packageFile) { public boolean allocateSpaceForUpdate(String packageFile) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.RECOVERY, null);
if (!isUpdatableApexSupported()) { if (!isUpdatableApexSupported()) {
Log.i(TAG, "Updatable Apex not supported, " Log.i(TAG, "Updatable Apex not supported, "
+ "allocateSpaceForUpdate does nothing."); + "allocateSpaceForUpdate does nothing.");
return true; return true;
} }
final long token = Binder.clearCallingIdentity();
try { try {
CompressedApexInfoList apexInfoList = getCompressedApexInfoList(packageFile); CompressedApexInfoList apexInfoList = getCompressedApexInfoList(packageFile);
ApexManager apexManager = ApexManager.getInstance(); ApexManager apexManager = ApexManager.getInstance();
@@ -975,6 +977,8 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo
e.rethrowAsRuntimeException(); e.rethrowAsRuntimeException();
} catch (IOException | UnsupportedOperationException e) { } catch (IOException | UnsupportedOperationException e) {
Slog.e(TAG, "Failed to reserve space for compressed apex: ", e); Slog.e(TAG, "Failed to reserve space for compressed apex: ", e);
} finally {
Binder.restoreCallingIdentity(token);
} }
return false; return false;
} }