Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c087fbc6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ca7d8451 62eed6be

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -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);