fix: Conflict incoming changes from 15-dev

This commit is contained in:
Pun Butrach
2025-11-22 17:14:31 +07:00
parent 14e352c827
commit 2e76c99dad
1726 changed files with 146971 additions and 95028 deletions

View File

@@ -41,8 +41,8 @@ import com.android.systemui.plugins.annotations.ProvidesInterface;
public interface VolumeDialogController {
int VERSION = 1;
void setActiveStream(int stream);
void setStreamVolume(int stream, int userLevel);
void setActiveStream(int stream, boolean sync);
void setStreamVolume(int stream, int userLevel, boolean sync);
void setRingerMode(int ringerModeNormal, boolean external);
boolean hasVibrator();