Merge "Fix spammy logging for route discovery prefs notifications" into main (5f76d509) · Commits · e / os / android_frameworks_base

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

+15 −11

Original line number	Diff line number	Diff line
		@@ -3009,6 +3009,19 @@ class MediaRouter2ServiceImpl {
		}
		}

		/**
		* Notifies the corresponding manager that the discovery preference has changed for the
		* given {@code packageName}.
		*/
		public void notifyDiscoveryPreferenceChanged(
		String packageName, RouteDiscoveryPreference preference) {
		try {
		mManager.notifyDiscoveryPreferenceChanged(packageName, preference);
		} catch (RemoteException ex) {
		logRemoteException("notifyDiscoveryPreferenceChanged", ex);
		}
		}

		/**
		* Notifies the corresponding manager that {@link RouteListingPreference} has changed for
		* the given {@code packageName}.
		@@ -4078,19 +4091,10 @@ class MediaRouter2ServiceImpl {

		private void notifyDiscoveryPreferenceChangedToManagers(@NonNull String routerPackageName,
		@Nullable RouteDiscoveryPreference discoveryPreference) {
		List<IMediaRouter2Manager> managers = new ArrayList<>();
		synchronized (mLock) {
		for (ManagerRecord managerRecord : mUserRecord.mManagerRecords) {
		managers.add(managerRecord.mManager);
		}
		}
		for (IMediaRouter2Manager manager : managers) {
		try {
		manager.notifyDiscoveryPreferenceChanged(routerPackageName,
		discoveryPreference);
		} catch (RemoteException ex) {
		Slog.w(TAG, "Failed to notify preferred features changed."
		+ " Manager probably died.", ex);
		managerRecord.notifyDiscoveryPreferenceChanged(
		routerPackageName, discoveryPreference);
		}
		}
		}