From 535c48fa5e226609433fb8a8158dd88ff270110c Mon Sep 17 00:00:00 2001
From: Tony Mak <tonymak@google.com>
Date: Mon, 4 Nov 2019 13:01:11 +0000
Subject: [PATCH] Fix an issue that statsd failed to update the uid mapping
 when ... version name of the app is null

informOnePackage fails silently when the version name is null.

Test: Using testdrive with an app without a version name.

Change-Id: I1b208f596bb9a8b88eb4bfa5a701aaec4570e5c2
---
 .../com/android/server/stats/StatsCompanionService.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
index 5e5a04b1af3b9..518a29c2017a1 100644
--- 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) {