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

Commit 353e415b authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge changes I65a32d47,Ib007dd57 into main

* changes:
  Clarify ambiguous log
  Logbuffer dropped huns even when debug is false
parents 54a2708a 855d7d52
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -403,9 +403,11 @@ constructor(
                    debugRunnableLabelMap.remove(r)
                }
            }
            val dropList = listToDrop.joinToString("\n ") { getKey(it) }
            headsUpManagerLogger.logDroppedHuns(dropList)
        }

        val dropListStr = listToDrop.joinToString("\n ") { getKey(it) }
        headsUpManagerLogger.logDroppedHuns(dropListStr)

        clearNext()
        showNow(headsUpEntryShowing!!, headsUpEntryShowingRunnableList)
    }
+2 −1
Original line number Diff line number Diff line
@@ -1385,7 +1385,8 @@ public class HeadsUpManagerImpl
                    mPostTime = Math.max(mPostTime, now);
                }
            };
            mAvalancheController.update(this, runnable, "updateEntry (updatePostTime)");
            mAvalancheController.update(this, runnable, "updateEntry reason:"
                    + reason + " updatePostTime:" + updatePostTime);

            if (isSticky()) {
                cancelAutoRemovalCallbacks("updateEntry (sticky)");