From 787c5b4948e309c0dbbf0f762c06fa07f88526b1 Mon Sep 17 00:00:00 2001
From: Phil Weaver <pweaver@google.com>
Date: Mon, 17 Jul 2017 16:40:48 -0700
Subject: Back-port ag/2514922

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: I9a58fd647e53cb41f577d8d4782221d73b49f668
---
 AndroidManifest.xml                                              | 1 +
 .../packageinstaller/permission/ui/OverlayTouchActivity.java     | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f08dca5d..30859021 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,6 +17,7 @@
     <uses-permission android:name="android.permission.READ_INSTALL_SESSIONS" />
     <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
     <uses-permission android:name="android.permission.KILL_UID" />
+    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
 
     <application android:label="@string/app_name"
             android:allowBackup="false"
diff --git a/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java b/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java
index 7b1d3793..b3938b1e 100644
--- a/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java
@@ -15,8 +15,11 @@
  */
 package com.android.packageinstaller.permission.ui;
 
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.MotionEvent;
 
 public class OverlayTouchActivity extends Activity {
@@ -27,6 +30,12 @@ public class OverlayTouchActivity extends Activity {
         return mObscuredTouch;
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        super.onCreate(savedInstanceState);
+    }
+
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
         mObscuredTouch = (event.getFlags() & (MotionEvent.FLAG_WINDOW_IS_OBSCURED
-- 
cgit v1.2.3