)]}'
{
  "commit": "17aa5aaa5f9c97a3de16b4af7dc758555e4687cf",
  "tree": "196f54da1483646e9a2a30db60bb1fd627756881",
  "parents": [
    "32ba2ef377de9df91f37575ee9dab8c88cd0f9a4"
  ],
  "author": {
    "name": "Nikolay Elenkov",
    "email": "nikolayelenkov@google.com",
    "time": "Sun Jun 30 06:23:00 2024 +0000"
  },
  "committer": {
    "name": "Android Build Coastguard Worker",
    "email": "android-build-coastguard-worker@google.com",
    "time": "Wed Jul 10 22:16:51 2024 +0000"
  },
  "message": "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()\n\nAdds deleteSecrets() to RecoverySystemService. This method is called\nfrom rebootRecoveryWithCommand () before the --wipe_data command is\npassed to recovery and the device is force-rebooted.\n\ndeleteSecerts() calls IKeystoreMaintenance.deleteAllKeys() in order to\nquickly destroy the keys protecting the synthetic password blobs\nused to derive FBE encryption keys.\n\nThe intent is to make FBE-encrypted data unrecoverable even if the full\ndata wipe in recovery is interrupted or skipped.\n\nBug: 324321147\nTest: Manual - System -\u003e Reset options -\u003e Erase all data.\nTest: Hold VolDown key to interrupt reboot and stop at bootloader\nscreen.\nTest: fastboot oem bcd wipe command \u0026\u0026 fastboot oem bcd wipe recovery\nTest: fastboot reboot\nTest: Device reboots into recovery and prompts to factory reset:\nTest: \u0027Cannot load Android system. Your data may be corrupt. ...\u0027\n(cherry picked from https://android-review.googlesource.com/q/commit:0d00031851e9f5d8ef93947205a7e8b5257f0d8d)\nIgnore-AOSP-First: Security fix backport\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dfbaa7295390de97ae2e8b154cc9be5512108ac4)\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d020a38e4148a642e2f06363e27cce60097efa5d)\nMerged-In: I5eb8e97f3ae1a18d5e7e7c2c7eca048ebff3440a\nChange-Id: I5eb8e97f3ae1a18d5e7e7c2c7eca048ebff3440a\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "919a93b8f10719c787ec53a9e532423c0d92ac02",
      "old_mode": 33188,
      "old_path": "keystore/java/android/security/AndroidKeyStoreMaintenance.java",
      "new_id": "b2d1755bb86071d94bfe59862917c00b61ac4570",
      "new_mode": 33188,
      "new_path": "keystore/java/android/security/AndroidKeyStoreMaintenance.java"
    },
    {
      "type": "modify",
      "old_id": "13218731af7053e79f48d09b417105a0e40ea9a5",
      "old_mode": 33188,
      "old_path": "services/core/java/com/android/server/recoverysystem/RecoverySystemService.java",
      "new_id": "23941bc338b8673fbd631b6f38691c93cb6be993",
      "new_mode": 33188,
      "new_path": "services/core/java/com/android/server/recoverysystem/RecoverySystemService.java"
    }
  ]
}