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

5610bcd0

Commit 5610bcd0 authored 2 years ago by Neil Fuller Committed by Automerger Merge Worker 2 years ago

Downloads
- Plain Diff

Merge "Fix metrics test flakiness" into tm-dev am: d718e76f am: d5318be2

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

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

parents fadea1e1 d5318be2

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

services/core/java/com/android/server/timezonedetector/ServiceConfigAccessorImpl.java 12 additions, 0 deletions

...id/server/timezonedetector/ServiceConfigAccessorImpl.java
services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java 2 additions, 2 deletions

...roid/server/timezonedetector/TimeZoneDetectorService.java
services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategy.java 6 additions, 0 deletions

...oid/server/timezonedetector/TimeZoneDetectorStrategy.java
services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategyImpl.java 14 additions, 0 deletions

...server/timezonedetector/TimeZoneDetectorStrategyImpl.java
services/tests/servicestests/src/com/android/server/timezonedetector/FakeTimeZoneDetectorStrategy.java 10 additions, 0 deletions

...server/timezonedetector/FakeTimeZoneDetectorStrategy.java

with 44 additions and 2 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