tree 81d28af258c9e8b330f34e6fc5d348f85ea8300d
parent 3a0dd0df135255c85a7b53fd9ef7681d5199a6c0
parent d715c91c2ac3a819c1816ece5129f81e34a545bc
author Jean-Michel Trivi <jmtrivi@google.com> 1601424449 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601424449 +0000

Merge "Use the try catch to deal with the StaleDataException." am: 1fa847ad64 am: 15698dd32d am: 4b16237ab7 am: d715c91c2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433917

Change-Id: I910b327fba414ae7ce3574acc078a0af40756b87