Merge "Remove notifyDiscoveryPreferenceChangedToManager" into main (5582f3c0) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java

+4 −15

Original line number	Diff line number	Diff line
		@@ -1932,10 +1932,10 @@ class MediaRouter2ServiceImpl {
		// How about removing mUserRecord from routerRecord?
		routerRecord.mUserRecord.mHandler.sendMessage(
		obtainMessage(
		UserHandler::notifyDiscoveryPreferenceChangedToManager,
		routerRecord.mUserRecord.mHandler,
		routerRecord,
		manager));
		ManagerRecord::notifyDiscoveryPreferenceChanged,
		managerRecord,
		routerRecord.mPackageName,
		routerRecord.mDiscoveryPreference));
		}

		userRecord.mHandler.sendMessage(
		@@ -4078,17 +4078,6 @@ class MediaRouter2ServiceImpl {
		}
		}

		private void notifyDiscoveryPreferenceChangedToManager(@NonNull RouterRecord routerRecord,
		@NonNull IMediaRouter2Manager manager) {
		try {
		manager.notifyDiscoveryPreferenceChanged(routerRecord.mPackageName,
		routerRecord.mDiscoveryPreference);
		} catch (RemoteException ex) {
		Slog.w(TAG, "Failed to notify preferred features changed."
		+ " Manager probably died.", ex);
		}
		}

		private void notifyDiscoveryPreferenceChangedToManagers(@NonNull String routerPackageName,
		@Nullable RouteDiscoveryPreference discoveryPreference) {
		synchronized (mLock) {