Merge "Report incorrect context usage in ViewConfiguration" into rvc-dev am: c64d21d47a am: 5d0046ee46

Change-Id: I756e272599474af76db88ffd6c6624a62a48b530
2020-03-27 20:36:17 +00:00
parent fb6316b3b1 5d0046ee46
commit bcbe1c853b
5 changed files with 57 additions and 8 deletions
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1920,7 +1920,9 @@ class ContextImpl extends Context {
        return SystemServiceRegistry.getSystemServiceName(serviceClass);
    }

-    private boolean isUiContext() {
+    /** @hide */
+    @Override
+    public boolean isUiContext() {
        return mIsSystemOrSystemUiContext || mIsUiContext || isSystemOrSystemUI();
    }