diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-06 17:07:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-06 17:07:30 -0700 |
| commit | 7930b5bc068e92a1eaaa6c890b77aebbdf01e259 (patch) | |
| tree | b5cedd92d4c2496e3b62bec803eec2cb49e7a8b1 | |
| parent | 40e828993405286e7e1f021fb5be65094bb6fe52 (diff) | |
| parent | 722665c5f76e81bed646490977ea30f38aaa00da (diff) | |
| download | frameworks_base-7930b5bc068e92a1eaaa6c890b77aebbdf01e259.zip frameworks_base-7930b5bc068e92a1eaaa6c890b77aebbdf01e259.tar.gz frameworks_base-7930b5bc068e92a1eaaa6c890b77aebbdf01e259.tar.bz2 | |
am 722665c5: am ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit '722665c5f76e81bed646490977ea30f38aaa00da'
* commit '722665c5f76e81bed646490977ea30f38aaa00da':
fix build. SurfaceView.setFrame needed to be hidden
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index a3d6049..b45aa99 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -287,6 +287,7 @@ public class SurfaceView extends View { setMeasuredDimension(width, height); } + /** @hide */ @Override protected boolean setFrame(int left, int top, int right, int bottom) { boolean result = super.setFrame(left, top, right, bottom); |