Merge "fixing java.lang.NullPointerException issues when cache is not build" into main (c327962b) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/SatelliteOptimizedApplicationsTracker.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ public class SatelliteOptimizedApplicationsTracker {
		List<UserInfo> users = mUserManager.getUsers();
		for (UserInfo user : users) {
		int userId = user.getUserHandle().getIdentifier();
		mSatelliteApplications.put(userId, new HashSet<>());
		mSatelliteApplications.putIfAbsent(userId, new HashSet<>());
		}
		// Get a list of installed packages
		List<PackageInfo> packages =
		@@ -213,6 +213,7 @@ public class SatelliteOptimizedApplicationsTracker {
		try {
		mPackageManager.getPackageUidAsUser(
		packageName, PackageManager.GET_META_DATA, userId);
		mSatelliteApplications.putIfAbsent(userId, new HashSet<>());
		mSatelliteApplications.get(userId).add(packageName);
		} catch (java.lang.Exception e) {
		// package is not present for current user
		@@ -229,7 +230,8 @@ public class SatelliteOptimizedApplicationsTracker {
		packageName, PackageManager.GET_META_DATA, userId);
		} catch (java.lang.Exception e) {
		// package is not present for current user
		if (mSatelliteApplications.get(userId).contains(packageName)) {
		if (mSatelliteApplications.containsKey(userId)
		&& mSatelliteApplications.get(userId).contains(packageName)) {
		mSatelliteApplications.get(userId).remove(packageName);
		}
		}
		@@ -240,7 +242,6 @@ public class SatelliteOptimizedApplicationsTracker {
		* Get list of applications that are optimized for low bandwidth satellite data.
		*
		* @param userId is Identifier of user
		*
		* @return List of applications package names with data optimized network property. {@link
		* #PROPERTY_SATELLITE_DATA_OPTIMIZED}
		*/