Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

918d7fe7

Commit 918d7fe7 authored 2 years ago by Remi NGUYEN VAN Committed by Automerger Merge Worker 2 years ago

Downloads
- Plain Diff

Merge changes Iac69f180,I99b6cc0e into udc-dev am: c505edcb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21910984

Change-Id: I78692adf59b177894ac192277ec0568f9b3c3ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b889db78 c505edcb

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/tests/coretests/src/android/provider/NameValueCacheTest.java 8 additions, 46 deletions

...ts/coretests/src/android/provider/NameValueCacheTest.java
packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java 3 additions, 29 deletions

...rc/com/android/providers/settings/GenerationRegistry.java
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java 9 additions, 23 deletions

.../src/com/android/providers/settings/SettingsProvider.java
packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java 0 additions, 6 deletions

...der/src/com/android/providers/settings/SettingsState.java
packages/SettingsProvider/test/src/com/android/providers/settings/GenerationRegistryTest.java 0 additions, 20 deletions

...om/android/providers/settings/GenerationRegistryTest.java

with 20 additions and 124 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