diff options
| author | Chet Haase <chet@google.com> | 2010-08-11 18:41:06 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2010-08-11 18:41:06 -0700 |
| commit | 949dbf7629eacfa02f267ade4643c98aef8e42a9 (patch) | |
| tree | e4c8d3335ce1ae8eb95207fe25cbc866222788a5 | |
| parent | 0df8bfed3c99aee39298e0b8cce187bc0bcb32c5 (diff) | |
| download | frameworks_base-949dbf7629eacfa02f267ade4643c98aef8e42a9.zip frameworks_base-949dbf7629eacfa02f267ade4643c98aef8e42a9.tar.gz frameworks_base-949dbf7629eacfa02f267ade4643c98aef8e42a9.tar.bz2 | |
Fix the build from two breaking changes (update to current.xml and ViewRoot import)
Change-Id: I987b12f7c5fdd4137faa55405fce99bd6f73fc71
| -rw-r--r-- | api/current.xml | 8 | ||||
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml index 0f30449..2c88f11 100644 --- a/api/current.xml +++ b/api/current.xml @@ -4336,7 +4336,7 @@ type="int" transient="false" volatile="false" - value="16843560" + value="16843561" static="true" final="true" deprecated="not deprecated" @@ -4347,7 +4347,7 @@ type="int" transient="false" volatile="false" - value="16843561" + value="16843562" static="true" final="true" deprecated="not deprecated" @@ -4358,7 +4358,7 @@ type="int" transient="false" volatile="false" - value="16843558" + value="16843559" static="true" final="true" deprecated="not deprecated" @@ -4369,7 +4369,7 @@ type="int" transient="false" volatile="false" - value="16843559" + value="16843560" static="true" final="true" deprecated="not deprecated" diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 692d196..faa4783 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -33,6 +33,7 @@ import android.util.Config; import android.util.DisplayMetrics; import android.util.Log; import android.util.EventLog; +import android.util.Slog; import android.util.SparseArray; import android.view.View.MeasureSpec; import android.view.accessibility.AccessibilityEvent; |