Make isSystemProvider field final
Right now it's virtually final, but not quite. This change fixes that.
Bug: b/205124386
Test: presubmit
Flag: EXEMPT refactor
Change-Id: I70ed35ac45dbf22f01cb531bcb55fcc98d88c961
diff --git a/services/core/java/com/android/server/media/MediaRoute2Provider.java b/services/core/java/com/android/server/media/MediaRoute2Provider.java
index b0fa523..58c8450 100644
--- a/services/core/java/com/android/server/media/MediaRoute2Provider.java
+++ b/services/core/java/com/android/server/media/MediaRoute2Provider.java
@@ -42,15 +42,16 @@
final Object mLock = new Object();
Callback mCallback;
- boolean mIsSystemRouteProvider;
+ public final boolean mIsSystemRouteProvider;
private volatile MediaRoute2ProviderInfo mProviderInfo;
@GuardedBy("mLock")
final List<RoutingSessionInfo> mSessionInfos = new ArrayList<>();
- MediaRoute2Provider(@NonNull ComponentName componentName) {
+ MediaRoute2Provider(@NonNull ComponentName componentName, boolean isSystemRouteProvider) {
mComponentName = Objects.requireNonNull(componentName, "Component name must not be null.");
mUniqueId = componentName.flattenToShortString();
+ mIsSystemRouteProvider = isSystemRouteProvider;
}
public void setCallback(Callback callback) {
diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
index 56b93e8..db1e6b4 100644
--- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
+++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
@@ -96,7 +96,7 @@
@NonNull ComponentName componentName,
boolean isSelfScanOnlyProvider,
int userId) {
- super(componentName);
+ super(componentName, /* isSystemRouteProvider= */ false);
mContext = Objects.requireNonNull(context, "Context must not be null.");
mRequestIdToSessionCreationRequest = new LongSparseArray<>();
mSessionOriginalIdToTransferRequest = new HashMap<>();
diff --git a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
index 8c6273c..49897b9 100644
--- a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
+++ b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
@@ -90,8 +90,7 @@
private volatile SessionCreationOrTransferRequest mPendingTransferRequest;
SystemMediaRoute2Provider(Context context, UserHandle user, Looper looper) {
- super(COMPONENT_NAME);
- mIsSystemRouteProvider = true;
+ super(COMPONENT_NAME, /* isSystemRouteProvider= */ true);
mContext = context;
mUser = user;
mHandler = new Handler(looper);