Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add debug for b/7094175." into jb-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-09-19 13:07:53 -07:00
committed by Android (Google) Code Review
parent a1c46636dd 0cbfcffe7b
commit 8f301e6668
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/Resources.java
View File

@@ -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());

4
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
View File

@@ -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);