PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the ANR in panel when changing volume continuously" into rvc-qpr-dev

Browse Source
This commit is contained in:
Jason Chiu
2020-09-23 03:01:56 +00:00
committed by Android (Google) Code Review
parent a78af692c6 f447cbbcb5
commit c3ed62e3ae
8 changed files with 451 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
View File

@@ -64,6 +64,7 @@ public abstract class AdjustVolumeRestrictedPreferenceController extends
filter.addAction(AudioManager.VOLUME_CHANGED_ACTION);
filter.addAction(AudioManager.STREAM_MUTE_CHANGED_ACTION);
filter.addAction(AudioManager.MASTER_MUTE_CHANGED_ACTION);
filter.addAction(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
return filter;
}
}

5
src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
View File

@@ -107,7 +107,10 @@ public abstract class VolumeSeekBarPreferenceController extends
return mHelper.getMinVolume(getAudioStream());
}
protected abstract int getAudioStream();
/**
* @return the audio stream type
*/
public abstract int getAudioStream();
protected abstract int getMuteIcon();

10
src/com/android/settings/slices/CustomSliceRegistry.java
View File

@@ -216,6 +216,16 @@ public class CustomSliceRegistry {
.appendPath("ring_volume")
.build();
/**
* Full {@link Uri} for the all volume Slices.
*/
public static final Uri VOLUME_SLICES_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath("volume_slices")
.build();
/**
* Full {@link Uri} for the Wifi Calling Slice.
*/

14
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -47,6 +47,7 @@ import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.bluetooth.BluetoothSliceBuilder;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.notification.VolumeSeekBarPreferenceController;
import com.android.settings.notification.zen.ZenModeSliceBuilder;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.SliceBroadcastRelay;
@@ -184,7 +185,10 @@ public class SettingsSliceProvider extends SliceProvider {
@Override
public void onSliceUnpinned(Uri sliceUri) {
SliceBroadcastRelay.unregisterReceivers(getContext(), sliceUri);
final Context context = getContext();
if (!VolumeSliceHelper.unregisterUri(context, sliceUri)) {
SliceBroadcastRelay.unregisterReceivers(context, sliceUri);
}
ThreadUtils.postOnMainThread(() -> stopBackgroundWorker(sliceUri));
}
@@ -390,7 +394,13 @@ public class SettingsSliceProvider extends SliceProvider {
final IntentFilter filter = controller.getIntentFilter();
if (filter != null) {
registerIntentToUri(filter, uri);
if (controller instanceof VolumeSeekBarPreferenceController) {
// Register volume slices to a broadcast relay to reduce unnecessary UI updates
VolumeSliceHelper.registerIntentToUri(getContext(), filter, uri,
((VolumeSeekBarPreferenceController) controller).getAudioStream());
} else {
registerIntentToUri(filter, uri);
}
}
ThreadUtils.postOnMainThread(() -> startBackgroundWorker(controller, uri));

127
src/com/android/settings/slices/VolumeSliceHelper.java Normal file
View File

@@ -0,0 +1,127 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.slices;
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_SLICES_URI;
import android.content.ContentProvider;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.media.AudioManager;
import android.net.Uri;
import android.util.ArrayMap;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.settingslib.SliceBroadcastRelay;
import java.util.Map;
/**
* This helper is to handle the broadcasts of volume slices
*/
public class VolumeSliceHelper {
private static final String TAG = "VolumeSliceHelper";
@VisibleForTesting
static Map<Uri, Integer> sRegisteredUri = new ArrayMap<>();
@VisibleForTesting
static IntentFilter sIntentFilter;
static void registerIntentToUri(Context context, IntentFilter intentFilter, Uri sliceUri,
int audioStream) {
Log.d(TAG, "Registering uri for broadcast relay: " + sliceUri);
synchronized (sRegisteredUri) {
if (sRegisteredUri.isEmpty()) {
SliceBroadcastRelay.registerReceiver(context, VOLUME_SLICES_URI,
VolumeSliceRelayReceiver.class, intentFilter);
sIntentFilter = intentFilter;
}
sRegisteredUri.put(sliceUri, audioStream);
}
}
static boolean unregisterUri(Context context, Uri sliceUri) {
if (!sRegisteredUri.containsKey(sliceUri)) {
return false;
}
Log.d(TAG, "Unregistering uri broadcast relay: " + sliceUri);
synchronized (sRegisteredUri) {
sRegisteredUri.remove(sliceUri);
if (sRegisteredUri.isEmpty()) {
sIntentFilter = null;
SliceBroadcastRelay.unregisterReceivers(context, VOLUME_SLICES_URI);
}
}
return true;
}
static void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
if (sIntentFilter == null || action == null || !sIntentFilter.hasAction(action)) {
return;
}
final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
if (uriString == null) {
return;
}
final Uri uri = Uri.parse(uriString);
if (!VOLUME_SLICES_URI.equals(ContentProvider.getUriWithoutUserId(uri))) {
Log.w(TAG, "Invalid uri: " + uriString);
return;
}
if (AudioManager.VOLUME_CHANGED_ACTION.equals(action)) {
handleVolumeChanged(context, intent);
} else if (AudioManager.STREAM_MUTE_CHANGED_ACTION.equals(action)
|| AudioManager.STREAM_DEVICES_CHANGED_ACTION.equals(action)) {
handleStreamChanged(context, intent);
} else {
notifyAllStreamsChanged(context);
}
}
private static void handleVolumeChanged(Context context, Intent intent) {
final int vol = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, -1);
final int prevVol = intent.getIntExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, -1);
if (vol != prevVol) {
handleStreamChanged(context, intent);
}
}
private static void handleStreamChanged(Context context, Intent intent) {
final int inputType = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1);
for (Map.Entry<Uri, Integer> entry : sRegisteredUri.entrySet()) {
if (entry.getValue() == inputType) {
context.getContentResolver().notifyChange(entry.getKey(), null /* observer */);
break;
}
}
}
private static void notifyAllStreamsChanged(Context context) {
sRegisteredUri.forEach((uri, audioStream) -> {
context.getContentResolver().notifyChange(uri, null /* observer */);
});
}
}

32
src/com/android/settings/slices/VolumeSliceRelayReceiver.java Normal file
View File

@@ -0,0 +1,32 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.slices;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
/**
* Receives broadcasts to notify that Settings volume Slices are potentially stale.
*/
public class VolumeSliceRelayReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
VolumeSliceHelper.onReceive(context, intent);
}
}