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

Merge "Clear caller id when reading device config"

Browse Source
This commit is contained in:
Tianjie Xu
2021-03-23 22:10:38 +00:00
committed by Gerrit Code Review
parent abffe558e3 18fb750cc5
commit d0fe0c721d
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -734,7 +734,15 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo
return REBOOT_ERROR_SLOT_MISMATCH; return REBOOT_ERROR_SLOT_MISMATCH;
} }
if (!mInjector.getLockSettingsService().armRebootEscrow()) { final long origId = Binder.clearCallingIdentity();
boolean result;
try {
result = mInjector.getLockSettingsService().armRebootEscrow();
} finally {
Binder.restoreCallingIdentity(origId);
}
if (!result) {
Slog.w(TAG, "Failure to escrow key for reboot"); Slog.w(TAG, "Failure to escrow key for reboot");
return REBOOT_ERROR_ARM_REBOOT_ESCROW_FAILURE; return REBOOT_ERROR_ARM_REBOOT_ESCROW_FAILURE;
} }
@@ -742,11 +750,20 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo
return REBOOT_ERROR_NONE; return REBOOT_ERROR_NONE;
} }
private boolean useServerBasedRoR() {
final long origId = Binder.clearCallingIdentity();
try {
return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_OTA,
"server_based_ror_enabled", false);
} finally {
Binder.restoreCallingIdentity(origId);
}
}
private void reportMetricsOnRebootWithLskf(String packageName, boolean slotSwitch, private void reportMetricsOnRebootWithLskf(String packageName, boolean slotSwitch,
@ResumeOnRebootRebootErrorCode int errorCode) { @ResumeOnRebootRebootErrorCode int errorCode) {
int uid = mInjector.getUidFromPackageName(packageName); int uid = mInjector.getUidFromPackageName(packageName);
boolean serverBased = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_OTA, boolean serverBased = useServerBasedRoR();
"server_based_ror_enabled", false);
int preparedClientCount; int preparedClientCount;
synchronized (this) { synchronized (this) {
preparedClientCount = mCallerPreparedForReboot.size(); preparedClientCount = mCallerPreparedForReboot.size();