From 1dbead1103c9f31e9c4507a22230c4bbec87ac53 Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Sun, 17 Aug 2014 16:34:08 -0700
Subject: [PATCH] Disable immersive mode confirmation for test automation

PolicyControl#disableImmersiveConfirmation to return true as
long as test harness flag is set.

Test harness flag is read via ro.test_harness, and can only be
set to true on builds with root access

Change-Id: I5c2d56e8ea4d5a2972ab42e9a98eb2fce52b11ee
---
 .../src/com/android/internal/policy/impl/PolicyControl.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/policy/src/com/android/internal/policy/impl/PolicyControl.java b/policy/src/com/android/internal/policy/impl/PolicyControl.java
index ffdb520e17287..9abd906719ed5 100644
--- a/policy/src/com/android/internal/policy/impl/PolicyControl.java
+++ b/policy/src/com/android/internal/policy/impl/PolicyControl.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.policy.impl;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -104,8 +105,9 @@ public class PolicyControl {
     }
 
     public static boolean disableImmersiveConfirmation(String pkg) {
-        return sImmersivePreconfirmationsFilter != null
-                && sImmersivePreconfirmationsFilter.matches(pkg);
+        return (sImmersivePreconfirmationsFilter != null
+                && sImmersivePreconfirmationsFilter.matches(pkg))
+                || ActivityManager.isRunningInTestHarness();
     }
 
     public static void reloadFromSetting(Context context) {