tree 68e62957fffa0421b68b29c7fcb82e9e7a057be4
parent d1833c1bfdd10a99a5403f5c0b5a56dc65ef0fb2
parent 89125443c97e955353f66761cd828f14ce20296c
author Tim Murray <timmurray@google.com> 1612212862 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1612212862 +0000

Merge changes I9c59a934,I11743d78 into sc-dev

* changes:
  NotificationManagerService: check cache before checking contacts
  UsageStatsService: rewrite locking to avoid contention post-unlock