From f9cdc3e963f9ef19eedfdd927f3cabe22ec1489f Mon Sep 17 00:00:00 2001
From: tmfang <tmfang@google.com>
Date: Thu, 21 Feb 2019 14:52:39 +0800
Subject: [PATCH] Fix test cases for Privacy package

Test: robotest
Fixes: 124970652
Change-Id: I165a1658a4a40499e0b9ec6dd03ada86b9631b06
---
 .../PermissionBarChartPreferenceControllerTest.java        | 5 +++++
 .../settings/privacy/PrivacyDashboardFragmentTest.java     | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
index f9913f671d8..f664f4f9140 100644
--- a/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
@@ -33,6 +33,7 @@ import android.content.pm.UserInfo;
 import android.os.UserManager;
 import android.permission.RuntimePermissionUsageInfo;
 import android.provider.DeviceConfig;
+import android.view.accessibility.AccessibilityManager;
 
 import androidx.preference.PreferenceScreen;
 
@@ -55,6 +56,7 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
 import java.util.ArrayList;
@@ -80,6 +82,9 @@ public class PermissionBarChartPreferenceControllerTest {
         final Context context = RuntimeEnvironment.application;
         final UserManager userManager = context.getSystemService(UserManager.class);
         final ShadowUserManager shadowUserManager = Shadow.extract(userManager);
+        final ShadowAccessibilityManager accessibilityManager = Shadow.extract(
+                AccessibilityManager.getInstance(context));
+        accessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());
         shadowUserManager.addProfile(new UserInfo(123, null, 0));
         when(FakeFeatureFactory.setupForTest().securityFeatureProvider.getLockPatternUtils(
                 any(Context.class))).thenReturn(mLockPatternUtils);
diff --git a/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
index 161c39a772c..482eaebf4b7 100644
--- a/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
@@ -29,6 +29,7 @@ import android.os.Bundle;
 import android.os.UserManager;
 import android.permission.PermissionControllerManager;
 import android.view.View;
+import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -44,8 +45,11 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
+import java.util.ArrayList;
+
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowUserManager.class, ShadowPermissionControllerManager.class})
@@ -65,6 +69,9 @@ public class PrivacyDashboardFragmentTest {
         mContext = RuntimeEnvironment.application;
         final UserManager userManager = mContext.getSystemService(UserManager.class);
         final ShadowUserManager shadowUserManager = Shadow.extract(userManager);
+        final ShadowAccessibilityManager accessibilityManager = Shadow.extract(
+                AccessibilityManager.getInstance(mContext));
+        accessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());
         shadowUserManager.addProfile(new UserInfo(123, null, 0));
         when(FakeFeatureFactory.setupForTest().securityFeatureProvider.getLockPatternUtils(
                 any(Context.class))).thenReturn(mLockPatternUtils);