commit fc4cf2da34335fd7e84c020f51eea1a341d3f134
author Makoto Onuki <omakoto@google.com> Wed Aug 24 11:10:26 2016 -0700
committer Makoto Onuki <omakoto@google.com> Wed Aug 24 13:52:02 2016 -0700
tree 66db3d42726209852bbf7058c9b7d349c445056a
parent 4d826638ab1ba3f90a67d0cf4d9256d4e88ee002

Shortcut: Improve backup & restore

* Catch RuntimeException from restore, in case restoring from a
partner device with an incompatible file format.

* When a restore target app is already installed, and
- if it has allowBackup=true, we'll restore normally, so all
existing shortcuts will be replaced. (but manifest shortcuts
will be re-published anyway.) We log a warning on logcat.

- if it has allowBackup=false, we don't touch any of the
existing shortcuts.

Bug 31057974
Bug 30766177

Change-Id: Ic3f7e860e7ea0d086fc589d8cbed8c4cebdd4bc6