ObliviOS Developer portal Project site

Home / Decisions / ADR-234

Consolidate the exported frameworks-base series of credential/duress-unlock-decoy in oblivios-platform from 53 patches to 7, joining only neighbouring patches (old…

Accepted, recorded 15 November 2026.

Decision
ADR-234
Date
2026-11-15
Status
AcceptedAccepted (owner, 2026-11-15: the owner asked to squash the patches as before and allowed read-only SSH to the build server). Committed in oblivios-platform as faf8691 (decoy) and 7228dfa (grab, linkability), not pushed.
Part
Duress Unlock
Mentions
ADR-098, ADR-163, ADR-233

1Decision

Consolidate the exported frameworks-base series of credential/duress-unlock-decoy in oblivios-platform from 53 patches to 7, joining only neighbouring patches (old 0001-0007, 0008-0016, 0018-0025, 0026-0036, 0037-0045, 0046-0049, 0050-0054), by the method of ADR-098 and ADR-163.

The same pass squashes the frameworks-base series of physical/grab-detection from 12 to 2 (old 0001-0008, 0009-0012) and of privacy/linkability from 10 to 4, one per concern (Permissions 0001; Clipboard 0002, 0007; SettingsProvider 0003, 0005, 0006, 0010; Vibrator 0004, 0008, 0009; these were interleaved but touch different files, and the equal tree below makes the new order safe).

The old numbers stay valid in SOURCE.md, HISTORY.md, README.md, ADR-233 and the rows DUR-0xx; SOURCE.md of the package maps them to the new files. The git history of oblivios-platform is not squashed.

2Why and evidence

[verified-in-source] On base ef50701b0b59 (parent of the first landed commit of the series on oblivios-2026110200) the 53 old files and the 7 new files, applied from scratch, give the same tree fa01387781327a24568674296788d07182177b66; 73 of the 78 changed files have the blob of the build server branch tip 7bc79c21e815 (the other five are shared with other packages); the 7 files apply with plain git am on a tree that already holds the frameworks-base series of the other packages except compartments-profiles.

For grab-detection and linkability the old and the new files also give the same tree (b37bb2f0fac6, 373227c915df) on the parent of the first landed commit of each series, the new files apply to the base revisions their SOURCE.md names (7320e4e97e5d, e9f0c1e67143, read from the build server), 9 and 8 files have the blob of the branch tip, and they apply with plain git am on the other series.

A reviewer meets 7 concerns instead of 53 patches that rewrite each other (the cold unlock alone was 11 patches, the stage 13).

3Consequences

Rejected: squashing the git history of the repository (581 commits; about 165 records cite its SHAs, and the 38 MB pack is the 8 versions of the 19 MB exitd, which a squash of patches does not change); joining non-neighbouring patches that change the same files (only the linkability patches with disjoint files were joined across neighbours). [assumption] The squashed series applies on the real tree as it does here; not built, not run on a device.

Open, found while checking: privacy/compartments-profiles/patches/frameworks-base/0011 expects the import list of LoadedApk.java of an older upstream and does not apply on the base of 2026110200; the other long series (compartments, datamap, which ADR-163 left out, and the Settings, Telephony, wifi, Bluetooth and sepolicy trees) are not consolidated yet and need a seed from the build server per tree.

4Review when

An image build shows a patch of the 7 that does not apply; the series grows past about 15 patches again.

Read from docs/governance/decision-log.md, entry ADR-234.