From 4522db7876176e2b83e6d9c6e6afedb12c394994 Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@eelo.io>
Date: Mon, 7 Oct 2019 12:45:59 +0000
Subject: [PATCH 1/7] disable "mEnabled = false" in onCreate in
 settings/PrivacySettings.java

---
 src/com/android/settings/PrivacySettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index a0dcd2e5cad..fc17f815e99 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -83,7 +83,8 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
         // 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 = false;
+        //UserManager.get(getActivity()).isAdminUser();
         if (!mEnabled) {
             return;
         }
-- 
GitLab


From 56e8b8d39f52934788c7382c3754774af6aaebb0 Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@eelo.io>
Date: Mon, 7 Oct 2019 12:50:44 +0000
Subject: [PATCH 2/7] Update SettingsActivity.java by commenting
 'useDefaultBackup = false;'

---
 src/com/android/settings/SettingsActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index b83f6f9c956..b5a6955b6f9 100755
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1175,7 +1175,7 @@ public class SettingsActivity extends SettingsDrawerActivity
         boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);
 
 		// /e/ Do NOT display Backup & reset item for the moment.
-        useDefaultBackup = false;
+        //useDefaultBackup = false;
         setTileEnabled(new ComponentName(packageName,
                 Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm);
         boolean hasBackupActivity = false;
-- 
GitLab


From 5ebd96d4db861c3387a1218405998c0df9331f73 Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@eelo.io>
Date: Tue, 8 Oct 2019 13:43:10 +0000
Subject: [PATCH 3/7] Update PrivacySettings.java

---
 src/com/android/settings/PrivacySettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index fc17f815e99..ff2b53f9bd0 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -84,7 +84,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
         
         // /e/ Do NOT display Backup & reset item for the moment.
         //mEnabled = false;
-        //UserManager.get(getActivity()).isAdminUser();
+        UserManager.get(getActivity()).isAdminUser();
         if (!mEnabled) {
             return;
         }
-- 
GitLab


From 5ad78b2ee072a0af89e6d6bcd0aab620e88ed398 Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@eelo.io>
Date: Tue, 8 Oct 2019 13:51:56 +0000
Subject: [PATCH 4/7] Update PrivacySettings.java

---
 src/com/android/settings/PrivacySettings.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index ff2b53f9bd0..eb39dfafc98 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -82,9 +82,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
         // 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;
         }
-- 
GitLab


From cd18b5bb5b1ac4c61c7e54cdcdddd3b7cda8608d Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@eelo.io>
Date: Tue, 8 Oct 2019 13:56:59 +0000
Subject: [PATCH 5/7] Update privacy_settings.xml

Disable Backup entry
---
 res/xml/privacy_settings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index f2af8f3fcbd..fbbc791ec36 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -19,6 +19,7 @@
     android:title="@string/privacy_settings_title">
 
     <!-- Backup settings -->
+    <!-- /e/ Disable Backup entry. 2019/10/08
     <PreferenceScreen
         android:key="backup_data"
         android:title="@string/backup_data_title"
@@ -49,7 +50,7 @@
         android:persistent="false"
         android:enabled="false"
         android:selectable="false" />
-
+    -->
     <!-- Factory reset -->
     <com.android.settingslib.RestrictedPreference
         android:key="factory_reset"
-- 
GitLab


From 9d28f80b2b479cfaa35a319869a581e7b609e641 Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@eelo.io>
Date: Tue, 8 Oct 2019 13:58:21 +0000
Subject: [PATCH 6/7] Update privacy_settings.xml

---
 res/xml/privacy_settings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index fbbc791ec36..75ce5f99890 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -29,8 +29,9 @@
     <PreferenceScreen
         android:key="configure_account"
         android:title="@string/backup_configure_account_title"
-        android:persistent="false">
+        android:persistent="false">-->
         <!-- the Intent declared here is always overwritten by a real one -->
+        <!-- /e/ Disable Backup entry. 2019/10/08
         <intent android:action="dummy" />
     </PreferenceScreen>
 
-- 
GitLab


From 6dd6337448007d6c4ba407ca2ecc184f59bbf2ce Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@eelo.io>
Date: Wed, 9 Oct 2019 12:28:29 +0000
Subject: [PATCH 7/7] Disable entry relative to backup

---
 src/com/android/settings/PrivacySettings.java | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index eb39dfafc98..f9e0619fe2c 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -89,7 +89,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
 
         addPreferencesFromResource(R.xml.privacy_settings);
         final PreferenceScreen screen = getPreferenceScreen();
-        mBackupManager = IBackupManager.Stub.asInterface(
+        /*mBackupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
 
         mBackup = (PreferenceScreen) screen.findPreference(BACKUP_DATA);
@@ -98,7 +98,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
         mAutoRestore.setOnPreferenceChangeListener(preferenceChangeListener);
 
         mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
-        mManageData = (PreferenceScreen) screen.findPreference(DATA_MANAGEMENT);
+        mManageData = (PreferenceScreen) screen.findPreference(DATA_MANAGEMENT);*/
 
         Set<String> keysToRemove = new HashSet<>();
         getNonVisibleKeys(getActivity(), keysToRemove);
@@ -110,7 +110,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
             }
         }
 
-        updateToggles();
+        //updateToggles();
     }
 
     @Override
@@ -118,9 +118,9 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
         super.onResume();
 
         // Refresh UI
-        if (mEnabled) {
+       /* if (mEnabled) {
             updateToggles();
-        }
+        }*/
     }
 
     private OnPreferenceChangeListener preferenceChangeListener = new OnPreferenceChangeListener() {
@@ -131,14 +131,14 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
             }
             boolean nextValue = (Boolean) newValue;
             boolean result = false;
-            if (preference == mAutoRestore) {
+            /*if (preference == mAutoRestore) {
                 try {
                     mBackupManager.setAutoRestore(nextValue);
                     result = true;
                 } catch (RemoteException e) {
                     mAutoRestore.setChecked(!nextValue);
                 }
-            }
+            }*/
             return result;
         }
     };
@@ -264,7 +264,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
     }
 
     private static void getNonVisibleKeys(Context context, Collection<String> nonVisibleKeys) {
-        final IBackupManager backupManager = IBackupManager.Stub.asInterface(
+        /*final IBackupManager backupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
         boolean isServiceActive = false;
         try {
@@ -272,17 +272,17 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
         } catch (RemoteException e) {
             Log.w(TAG, "Failed querying backup manager service activity status. " +
                     "Assuming it is inactive.");
-        }
+        }*/
         boolean vendorSpecific = context.getPackageManager().
                 resolveContentProvider(GSETTINGS_PROVIDER, 0) == null;
-        if (vendorSpecific || isServiceActive) {
+        /*if (vendorSpecific || isServiceActive) {
             nonVisibleKeys.add(BACKUP_INACTIVE);
         }
         if (vendorSpecific || !isServiceActive) {
             nonVisibleKeys.add(BACKUP_DATA);
             nonVisibleKeys.add(AUTO_RESTORE);
             nonVisibleKeys.add(CONFIGURE_ACCOUNT);
-        }
+        }*/
         if (RestrictedLockUtils.hasBaseUserRestriction(context,
                 UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
             nonVisibleKeys.add(FACTORY_RESET);
-- 
GitLab