Merge "Fix an issue that statsd failed to update the uid mapping when ... version name of the app is null"

2019-11-04 16:34:44 +00:00
parent f822d418e3 535c48fa5e
commit bd1b494bda
1 changed files with 5 additions and 1 deletions
--- a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
+++ b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
@@ -583,7 +583,11 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
                        } catch (IllegalArgumentException e) {
                            installer = "";
                        }
-                        sStatsd.informOnePackage(app, uid, pi.getLongVersionCode(), pi.versionName,
+                        sStatsd.informOnePackage(
+                                app,
+                                uid,
+                                pi.getLongVersionCode(),
+                                pi.versionName == null ? "" : pi.versionName,
                                installer == null ? "" : installer);
                    }
                } catch (Exception e) {