From 17d9e9c36d789061782592a83e20144e991cd0cb Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Fri, 10 Feb 2017 16:18:09 -0800 Subject: [PATCH] Dismiss keyguard before displaying bugrepot details dialog. Fixes: 27494228 Test: manual verification Test: BugreportReceiverTest passes Change-Id: I7755fc2d3d4f1f9b55301c65f7a58c9374e93664 --- .../com/android/shell/BugreportProgressService.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 26568ccccaf22..37ea537b2fea9 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -92,6 +92,7 @@ import android.util.Log; import android.util.Pair; import android.util.Patterns; import android.util.SparseArray; +import android.view.IWindowManager; import android.view.View; import android.view.WindowManager; import android.view.View.OnFocusChangeListener; @@ -579,6 +580,16 @@ public class BugreportProgressService extends Service { } collapseNotificationBar(); + + // Dissmiss keyguard first. + final IWindowManager wm = IWindowManager.Stub + .asInterface(ServiceManager.getService(Context.WINDOW_SERVICE)); + try { + wm.dismissKeyguard(null); + } catch (Exception e) { + // ignore it + } + mInfoDialog.initialize(mContext, info); }