Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove RingtoneManager.*SyncFromParent APIs"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-14 18:13:16 +00:00
committed by Android (Google) Code Review
parent 0b93c3b8d2 9959d337c1
commit ee888a9b76
3 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/IAudioService.aidl
View File

@@ -267,8 +267,6 @@ interface IAudioService {
List<AudioPlaybackConfiguration> getActivePlaybackConfigurations();
void disableRingtoneSync(in int userId);
int getFocusRampTimeMs(in int focusGain, in AudioAttributes attr);
int dispatchFocusChange(in AudioFocusInfo afi, in int focusChange,

31
media/java/android/media/RingtoneManager.java
View File

@@ -748,32 +748,6 @@ public class RingtoneManager {
return null;
}
/**
* Disables Settings.System.SYNC_PARENT_SOUNDS.
*
* @hide
*/
public static void disableSyncFromParent(Context userContext) {
IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE);
IAudioService audioService = IAudioService.Stub.asInterface(b);
try {
audioService.disableRingtoneSync(userContext.getUserId());
} catch (RemoteException e) {
Log.e(TAG, "Unable to disable ringtone sync.");
}
}
/**
* Enables Settings.System.SYNC_PARENT_SOUNDS for the content's user
*
* @hide
*/
@RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
public static void enableSyncFromParent(Context userContext) {
Settings.Secure.putIntForUser(userContext.getContentResolver(),
Settings.Secure.SYNC_PARENT_SOUNDS, 1 /* true */, userContext.getUserId());
}
/**
* Gets the current default sound's {@link Uri}. This will give the actual
* sound {@link Uri}, instead of using this, most clients can use
@@ -818,11 +792,6 @@ public class RingtoneManager {
if (setting == null) return;
final ContentResolver resolver = context.getContentResolver();
if (Settings.Secure.getIntForUser(resolver, Settings.Secure.SYNC_PARENT_SOUNDS, 0,
context.getUserId()) == 1) {
// Parent sound override is enabled. Disable it using the audio service.
disableSyncFromParent(context);
}
if(!isInternalRingtoneUri(ringtoneUri)) {
ringtoneUri = ContentProvider.maybeAddUserId(ringtoneUri, context.getUserId());
}

16
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -10012,22 +10012,6 @@ public class AudioService extends IAudioService.Stub
mRecordMonitor.releaseRecorder(riid);
}
public void disableRingtoneSync(final int userId) {
final int callingUserId = UserHandle.getCallingUserId();
if (callingUserId != userId) {
mContext.enforceCallingOrSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL,
"disable sound settings syncing for another profile");
}
final long token = Binder.clearCallingIdentity();
try {
// Disable the sync setting so the profile uses its own sound settings.
Settings.Secure.putIntForUser(mContentResolver, Settings.Secure.SYNC_PARENT_SOUNDS,
0 /* false */, userId);
} finally {
Binder.restoreCallingIdentity(token);
}
}
//======================
// Audio playback notification
//======================