Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a7ed76d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable IMS and its config context to obtain UI component"" into... 

Merge "Revert "Enable IMS and its config context to obtain UI component"" into rvc-dev am: 9e7c4619 am: 213be879 am: 3243b12a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988595

Change-Id: I27067a83ee6446258cebcb9118f1547f4aab8b6d
parents d88a4098 3243b12a

core/java/android/app/ContextImpl.java

+2 −5
Original line number Diff line number Diff line
@@ -1900,13 +1900,11 @@ class ContextImpl extends Context { 


    @Override

    public Object getSystemService(String name) {

        // We may override this API from outer context.

        final boolean isUiContext = isUiContext() || getOuterContext().isUiContext();

        // Check incorrect Context usage.

        if (isUiComponent(name) && !isUiContext && vmIncorrectContextUseEnabled()) {

        if (isUiComponent(name) && !isUiContext() && vmIncorrectContextUseEnabled()) {

            final String errorMessage = "Tried to access visual service "

                    + SystemServiceRegistry.getSystemServiceClassName(name)

                    + " from a non-visual Context:" + getOuterContext();

                    + " from a non-visual Context. ";

            final String message = "Visual services, such as WindowManager, WallpaperService or "

                    + "LayoutInflater should be accessed from Activity or other visual Context. "

                    + "Use an Activity or a Context created with "
@@ -2371,7 +2369,6 @@ class ContextImpl extends Context { 
        context.setResources(createResources(mToken, mPackageInfo, mSplitName, displayId,

                overrideConfiguration, getDisplayAdjustments(displayId).getCompatibilityInfo(),

                mResources.getLoaders()));

        context.mIsUiContext = isUiContext() || getOuterContext().isUiContext();

        return context;

    }

core/java/android/view/ViewConfiguration.java

+2 −3
Original line number Diff line number Diff line
@@ -500,13 +500,12 @@ public class ViewConfiguration { 
     */

    public static ViewConfiguration get(Context context) {

        if (!context.isUiContext() && vmIncorrectContextUseEnabled()) {

            final String errorMessage = "Tried to access UI constants from a non-visual Context:"

                    + context;

            final String errorMessage = "Tried to access UI constants from a non-visual Context.";

            final String message = "UI constants, such as display metrics or window metrics, "

                    + "must be accessed from Activity or other visual Context. "

                    + "Use an Activity or a Context created with "

                    + "Context#createWindowContext(int, Bundle), which are adjusted to the "

                    + "configuration and visual bounds of an area on screen";

                    + "configuration and visual bounds of an area on screen.";

            final Exception exception = new IllegalArgumentException(errorMessage);

            StrictMode.onIncorrectContextUsed(message, exception);

            Log.e(TAG, errorMessage + message, exception);