From 31d1d237ec31d14d47d70dd5632052c873de89b7 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Tue, 27 Feb 2024 11:39:36 +0000
Subject: [PATCH] Revert "Flag RingtoneSelection.Builder with
FLAG_HAPTICS_CUSTOMIZATION_ENABLED"
This reverts commit 63b358908bec82370d3979c13246c0743f5554c0.
Reason for revert: dead code
Bug: 301713440
Bug: 272282867
Bug: 323853450
Test: n/a
Change-Id: Ib4107133b275ea40e694fe5e0914c188844851bf
---
core/api/test-current.txt | 2 +-
media/java/android/media/RingtoneSelection.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index fc095d482450..14a49d3363ed 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -2000,7 +2000,7 @@ package android.media {
field public static final int VIBRATION_SOURCE_URI = 2; // 0x2
}
- @FlaggedApi("android.os.vibrator.haptics_customization_enabled") public static final class RingtoneSelection.Builder {
+ public static final class RingtoneSelection.Builder {
ctor public RingtoneSelection.Builder();
ctor public RingtoneSelection.Builder(@NonNull android.media.RingtoneSelection);
method @NonNull public android.media.RingtoneSelection build();
diff --git a/media/java/android/media/RingtoneSelection.java b/media/java/android/media/RingtoneSelection.java
index b7c372182464..b74b6a3dbac9 100644
--- a/media/java/android/media/RingtoneSelection.java
+++ b/media/java/android/media/RingtoneSelection.java
@@ -642,7 +642,6 @@ public final class RingtoneSelection {
* allowing the user to configure their selection. Once a selection is stored as a Uri, then
* the RingtoneSelection can be loaded directly using {@link RingtoneSelection#fromUri}.
*/
- @FlaggedApi(Flags.FLAG_HAPTICS_CUSTOMIZATION_ENABLED)
public static final class Builder {
private Uri mSoundUri;
private Uri mVibrationUri;
--
GitLab