commit c087fbc6f4837ddf0d2d69551bb89277eef150ae
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 01 07:08:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 01 07:08:40 2019 +0000
tree 985871bb8a3f9f46d5701338cfdc3e254f116780
parent ca7d84517f6f1c66388e725e83a8996ce1b5c530
parent 62eed6be5417bb5312f16c47b634979222981091

Merge "View attr debug: avoid 'Invalid ID 0x00000000'"

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 1cc8499..38aac1b 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4835,7 +4835,7 @@
         View.sDebugViewAttributesApplicationPackage = mCoreSettings.getString(
                 Settings.Global.DEBUG_VIEW_ATTRIBUTES_APPLICATION_PACKAGE, "");
         String currentPackage = (mBoundApplication != null && mBoundApplication.appInfo != null)
-                ? mBoundApplication.appInfo.packageName : "";
+                ? mBoundApplication.appInfo.packageName : "<unknown-app>";
         View.sDebugViewAttributes =
                 mCoreSettings.getInt(Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0
                         || View.sDebugViewAttributesApplicationPackage.equals(currentPackage);