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

645ed0e3

Commit 645ed0e3 authored 1 year ago by Sam Dubey Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "Revert "Move RingtoneTest to media/tests/ringtone"" into main

parents 36d818fb dd57a938

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

media/java/android/media/RingtoneV1.java 27 additions, 16 deletions

media/java/android/media/RingtoneV1.java
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/RingtoneTest.java 247 additions, 38 deletions

...src/com/android/mediaframeworktest/unit/RingtoneTest.java
media/tests/ringtone/Android.bp 3 additions, 12 deletions

media/tests/ringtone/Android.bp
media/tests/ringtone/OWNERS 0 additions, 3 deletions

media/tests/ringtone/OWNERS
media/tests/ringtone/src/com/android/media/testing/MediaPlayerTestHelper.java 0 additions, 75 deletions

.../src/com/android/media/testing/MediaPlayerTestHelper.java
media/tests/ringtone/src/com/android/media/testing/RingtoneInjectablesTrackingTestRule.java 0 additions, 225 deletions

...id/media/testing/RingtoneInjectablesTrackingTestRule.java

with 277 additions and 369 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