Merge "[Audiosharing] Reset shadows after tests." into main

src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java

@@ -60,7 +60,7 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere
     private final AtomicBoolean mCallbacksRegistered = new AtomicBoolean(false);
 
     @VisibleForTesting
-    protected final BluetoothLeBroadcast.Callback mBroadcastCallback =
+    final BluetoothLeBroadcast.Callback mBroadcastCallback =
             new BluetoothLeBroadcast.Callback() {
                 @Override
                 public void onBroadcastStarted(int reason, int broadcastId) {
@@ -219,7 +219,7 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere
 
     /** Test only: set callbacks registration state for test setup. */
     @VisibleForTesting
-    public void setCallbacksRegistered(boolean registered) {
+    void setCallbacksRegistered(boolean registered) {
         mCallbacksRegistered.set(registered);
     }
 

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDashboardFragment.java

@@ -103,7 +103,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment
 
     /** Test only: set mock controllers for the {@link AudioSharingDashboardFragment} */
     @VisibleForTesting
-    protected void setControllers(
+    void setControllers(
             AudioSharingDeviceVolumeGroupController volumeGroupController,
             AudioSharingCallAudioPreferenceController callAudioController,
             AudioSharingPlaySoundPreferenceController playSoundController,

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java

@@ -100,7 +100,8 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment {
 
     /** Test only: get the event data passed to the dialog. */
     @VisibleForTesting
-    protected @NonNull Pair<Integer, Object>[] getEventData() {
+    @NonNull
+    Pair<Integer, Object>[] getEventData() {
         return sEventData;
     }
 

src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java

@@ -105,7 +105,7 @@ public class AudioSharingPlaySoundPreferenceController
     }
 
     @VisibleForTesting
-    protected void setRingtone(Ringtone ringtone) {
+    void setRingtone(Ringtone ringtone) {
         mRingtone = ringtone;
     }
 

src/com/android/settings/connecteddevice/audiosharing/AudioSharingPreferenceController.java

@@ -52,7 +52,7 @@ public class AudioSharingPreferenceController extends BasePreferenceController
     private final Executor mExecutor;
 
     @VisibleForTesting
-    protected final BluetoothLeBroadcast.Callback mBroadcastCallback =
+    final BluetoothLeBroadcast.Callback mBroadcastCallback =
             new BluetoothLeBroadcast.Callback() {
                 @Override
                 public void onBroadcastStarted(int reason, int broadcastId) {

src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java

@@ -142,7 +142,8 @@ public class AudioSharingStopDialogFragment extends InstrumentedDialogFragment {
 
     /** Test only: get the event data passed to the dialog. */
     @VisibleForTesting
-    protected @NonNull Pair<Integer, Object>[] getEventData() {
+    @NonNull
+    Pair<Integer, Object>[] getEventData() {
         return sEventData;
     }