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

This commit is contained in:
TreeHugger Robot
2019-10-01 07:08:40 +00:00
committed by Android (Google) Code Review

View File

@@ -4835,7 +4835,7 @@ public final class ActivityThread extends ClientTransactionHandler {
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);