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

Commit b74d9f82 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 18f42668: am 8f301e66: Merge "Add debug for b/7094175." into jb-mr1-dev 

* commit '18f42668':
  Add debug for b/7094175.
parents 7d295bda 18f42668

core/java/android/content/res/Resources.java

+2 −0
Original line number Diff line number Diff line
@@ -1554,6 +1554,8 @@ public class Resources { 
    public static void updateSystemConfiguration(Configuration config, DisplayMetrics metrics,

            CompatibilityInfo compat) {

        if (mSystem != null) {

            // TODO: Remove once b/7094175 is fixed

            Slog.v(TAG, "updateSystemConfiguration: b/7094175 config=" + config);

            mSystem.updateConfiguration(config, metrics, compat);

            //Log.i(TAG, "Updated system resources " + mSystem

            //        + ": " + mSystem.getConfiguration());

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.PixelFormat; 
import android.os.IBinder;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Slog;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -165,6 +166,9 @@ public class KeyguardViewManager { 
        if (mKeyguardView != null) {

            mKeyguardHost.removeView(mKeyguardView);

        }

        // TODO: Remove once b/7094175 is fixed

        Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config="

                + mContext.getResources().getConfiguration());

        final LayoutInflater inflater = LayoutInflater.from(mContext);

        View view = inflater.inflate(R.layout.keyguard_host_view, mKeyguardHost, true);

        mKeyguardView = (KeyguardHostView) view.findViewById(R.id.keyguard_host_view);