Merge "Restoring pinned shortcuts to original state after restore" into qt-dev am: 011c18e22b

am: 3937b263ef Change-Id: I42b5db6ee730f288e9820c877c6ca71bcfebd703
2019-05-01 07:35:41 -07:00
parent cd4731fb2f 3937b263ef
commit ffe474de2f
3 changed files with 148 additions and 36 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -108,7 +108,7 @@
            android:hardwareAccelerated="true"
            android:requiredForAllUsers="true"
            android:supportsRtl="true"
-            android:allowBackup="false"
+            android:backupAgent="com.android.settings.backup.SettingsBackupHelper"
            android:usesCleartextTraffic="true"
            android:defaultToDeviceProtectedStorage="true"
            android:directBootAware="true"