Merge \"Set mContext scope to protected.\" into nyc-mr1-dev

am: 8709d0fce8 Change-Id: I23720c8a6f577da910a45bbbc4373f1ad9256ce8
2016-07-13 23:53:42 +00:00
parent 7628ae28d5 8709d0fce8
commit e4747b39f0
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -47,7 +47,7 @@ public class AssistManager {
    private static final long TIMEOUT_SERVICE = 2500;
    private static final long TIMEOUT_ACTIVITY = 1000;

-    private final Context mContext;
+    protected final Context mContext;
    private final WindowManager mWindowManager;
    private final AssistDisclosure mAssistDisclosure;