From 043a917a2f3a0f3bf8629a658d057ce8c10f421c Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Fri, 28 Aug 2020 16:32:30 +0530
Subject: [PATCH] Enable backup/restore

Change-Id: I3ebc2ed6232c0287abddeec122db34cb4a28811d
---
 res/xml/system_dashboard_fragment.xml          | 3 +--
 src/com/android/settings/PrivacySettings.java  | 2 +-
 src/com/android/settings/SettingsActivity.java | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 9ad12dd4e72..e4b74e06aaf 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -31,7 +31,6 @@
         settings:controller="com.android.settings.gestures.GesturesSettingPreferenceController"/>
 
     <!-- Backup -->
-    <!--
     <Preference
         android:key="backup_settings"
         android:title="@string/privacy_settings_title"
@@ -41,7 +40,7 @@
         settings:controller="com.android.settings.backup.BackupSettingsActivityPreferenceController">
         <intent android:action="android.settings.BACKUP_AND_RESET_SETTINGS" />
     </Preference>
-    -->
+    
     <Preference
         android:key="reset_dashboard"
         android:title="@string/reset_dashboard_title"
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 7c3ee82585f..0f15bede74b 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -83,7 +83,7 @@ public class PrivacySettings extends SettingsPreferenceFragment {
         // Don't allow any access if this is not an admin user.
         // TODO: backup/restore currently only works with owner user b/22760572
         // /e/ Do NOT display Backup & reset item for the moment.
-        mEnabled = false;//UserManager.get(getActivity()).isAdminUser();
+        mEnabled = UserManager.get(getActivity()).isAdminUser();
         if (!mEnabled) {
             return;
         }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 843d8a58d52..533ea4bbf15 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -712,7 +712,7 @@ public class SettingsActivity extends SettingsDrawerActivity
         // Enable/disable backup settings depending on whether the user is admin.
         // /e/ Do NOT display Backup & reset item for the moment.
         somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
-                BackupSettingsActivity.class.getName()), true, false)
+                BackupSettingsActivity.class.getName()), true, isAdmin)
                 || somethingChanged;
 
         somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
-- 
GitLab