From 46974b130e02979d975264fa81c9058b8d38c911 Mon Sep 17 00:00:00 2001
From: Flavio Fiszman <flaviocf@google.com>
Date: Fri, 23 Oct 2020 10:34:45 +0100
Subject: [PATCH] Add default value to People Space flags.

Change-Id: Idd6e7c3ef432ee6529d8c9fae740d01224080c18
Test: Boot device without flags and check behaviour.
Bug: 169783793
---
 .../src/com/android/systemui/SystemUIApplication.java         | 4 ++--
 .../src/com/android/systemui/people/PeopleSpaceUtils.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
index 3348bd1d1e230..e709830342b5a 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
@@ -113,7 +113,7 @@ public class SystemUIApplication extends Application implements
                     // TODO(b/170396074): Remove this when we don't need an icon anymore.
                     try {
                         int showPeopleSpace = Settings.Global.getInt(context.getContentResolver(),
-                                Settings.Global.SHOW_PEOPLE_SPACE);
+                                Settings.Global.SHOW_PEOPLE_SPACE, 0);
                         context.getPackageManager().setComponentEnabledSetting(
                                 new ComponentName(context, PeopleSpaceActivity.class),
                                 showPeopleSpace == 1
@@ -128,7 +128,7 @@ public class SystemUIApplication extends Application implements
                     // TODO(b/170396074): Remove this when we don't need a widget anymore.
                     try {
                         int showPeopleSpace = Settings.Global.getInt(context.getContentResolver(),
-                                Settings.Global.SHOW_PEOPLE_SPACE);
+                                Settings.Global.SHOW_PEOPLE_SPACE, 0);
                         context.getPackageManager().setComponentEnabledSetting(
                                 new ComponentName(context, PeopleSpaceWidgetProvider.class),
                                 showPeopleSpace == 1
diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java
index 9d46b321c52c5..2ddcc5aa77feb 100644
--- a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java
+++ b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java
@@ -50,7 +50,7 @@ public class PeopleSpaceUtils {
             IPeopleManager peopleManager
     ) throws Exception {
         boolean showAllConversations = Settings.Global.getInt(context.getContentResolver(),
-                Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE) == 0;
+                Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE, 0) == 0;
         List<ConversationChannelWrapper> conversations =
                 notificationManager.getConversations(
                         !showAllConversations /* priority only */).getList();