Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

24af7a43

Commit 24af7a43 authored 1 year ago by Florian Mayer Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "Add keep_memtag_mode extra to FACTORY_RESET intent" into main

parents 33ff2138 d00c68a9

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/os/RecoverySystem.java 14 additions, 2 deletions

core/java/android/os/RecoverySystem.java
services/core/java/com/android/server/MasterClearReceiver.java 7 additions, 2 deletions

...ces/core/java/com/android/server/MasterClearReceiver.java
services/core/java/com/android/server/testharness/TestHarnessModeService.java 14 additions, 0 deletions

...om/android/server/testharness/TestHarnessModeService.java
services/tests/mockingservicestests/src/com/android/server/MasterClearReceiverTest.java 9 additions, 3 deletions

...tests/src/com/android/server/MasterClearReceiverTest.java
services/tests/mockingservicestests/src/com/android/server/devicepolicy/FactoryResetterTest.java 7 additions, 4 deletions

.../com/android/server/devicepolicy/FactoryResetterTest.java

with 51 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment