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

Merge "Cache weak reference for static context." into sc-dev am: f7d20b351f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245990

Change-Id: I257dca8cb4b5a97868f19bcd4f9e3e8cd64ef2cf
This commit is contained in:
TreeHugger Robot
2021-07-10 00:01:32 +00:00
committed by Automerger Merge Worker
parent 34f39c86ba f7d20b351f
commit 199a5df6c1
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
media/java/android/media/AudioManager.java
View File

@@ -73,6 +73,7 @@ import com.android.internal.util.Preconditions;
import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -103,7 +104,7 @@ public class AudioManager {
private static final AudioVolumeGroupChangeHandler sAudioAudioVolumeGroupChangedHandler =
new AudioVolumeGroupChangeHandler();
private static Context sContext;
private static WeakReference<Context> sContext;
/**
* Broadcast intent, a hint for applications that audio is about to become
@@ -800,7 +801,7 @@ public class AudioManager {
} else {
mOriginalContext = context;
}
sContext = context;
sContext = new WeakReference<>(context);
}
@UnsupportedAppUsage
@@ -7256,23 +7257,27 @@ public class AudioManager {
*/
public static boolean hasHapticChannels(@Nullable Context context, @NonNull Uri uri) {
Objects.requireNonNull(uri);
if (context != null) {
return hasHapticChannelsImpl(context, uri);
} else if (sContext != null) {
}
Context cachedContext = sContext.get();
if (cachedContext != null) {
if (DEBUG) {
Log.d(TAG, "Try to use static context to query if having haptic channels");
}
return hasHapticChannelsImpl(sContext, uri);
} else {
// Try with audio service context, this may fail to get correct result.
if (DEBUG) {
Log.d(TAG, "Try to use audio service context to query if having haptic channels");
}
try {
return getService().hasHapticChannels(uri);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
return hasHapticChannelsImpl(cachedContext, uri);
}
// Try with audio service context, this may fail to get correct result.
if (DEBUG) {
Log.d(TAG, "Try to use audio service context to query if having haptic channels");
}
try {
return getService().hasHapticChannels(uri);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}