- Decision
- ADR-098
- Date
- 2026-09-25
- Status
- AcceptedAccepted
- Part
- Duress Unlock
- Mentions
- ADR-053, ADR-092, ADR-094, ADR-096
- Mentioned by
- ADR-099, ADR-163, ADR-234
1Decision
Consolidate the sovereignos-platform/credential/duress-unlock-decoy patch series from 107 patches to 13 (frameworks-base 93 → 10, packages-apps-settings 10 → 2, packages-apps-multiuser 4 → 1; build-release unchanged), package files only.
2Why and evidence
The fine-grained series (test/implementation pairs, corrections of earlier patches) made the package slow to review and apply, and the feature is closed (ADR-092, ADR-094 through ADR-096). Owner approved on 2026-09-25 with the scope limited to the package.
3Consequences
New patches group the old ones by concern; old numbers in ADR-053 through ADR-096 and in SOURCE.md history entries are pre-squash, with the old → new map at the top of SOURCE.md. The build-server branch sovereignos-duress-decoy-switch is not rewritten and keeps its original SHAs. Tree equivalence was checked against a clean git am of the exported patches (tree hashes recorded in SOURCE.md), not by a rebuild or device run.
4Review when
Re-open if the package and the build-server branch need to be reconciled to identical SHAs, or if the squashed form fails to apply to a new pinned manifest tag.
Read from docs/governance/decision-log.md, entry ADR-098.