diff options
| author | Craig Mautner <cmautner@google.com> | 2012-08-22 17:41:48 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-08-23 08:43:54 -0700 |
| commit | b47bbc3d80badb94229bc4ce7a2d5006faa9ef15 (patch) | |
| tree | f817ed4884677c168f2f7e0badceab7ad889fe73 /core/java/android | |
| parent | 2bd65b61ba6e98496dc574251e06709546d24500 (diff) | |
Clean up displayId and layerStack usage.
Make better use of Display object by saving it in DisplayContent.
Only use layerStack when referring to Surfaces. Get displayId from
default Display or default DisplayContent. Remove warnings.
Fixes bug 7038151.
Change-Id: Ie493f0f5e755dc9b91ee969ff561c2a098283ead
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/display/DisplayManager.java | 1 | ||||
| -rw-r--r-- | core/java/android/view/Surface.java | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index a73115c4324b..98d2f69ee226 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -24,7 +24,6 @@ import android.os.Message; import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; -import android.util.SparseArray; import android.view.CompatibilityInfoHolder; import android.view.Display; import android.view.DisplayInfo; diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 517b5147977d..a6d1a3f9d9ff 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -388,8 +388,8 @@ public class Surface implements Parcelable { /** Free all server-side state associated with this surface and * release this object's reference. @hide */ public native void destroy(); - - private native Canvas lockCanvasNative(Rect dirty); + + private native Canvas lockCanvasNative(Rect dirty) throws OutOfResourcesException; /** * set the orientation of the given display. @@ -497,10 +497,10 @@ public class Surface implements Parcelable { } private native void init(SurfaceSession s, - int pid, String name, int displayId, int w, int h, int format, int flags) + int pid, String name, int layerStack, int w, int h, int format, int flags) throws OutOfResourcesException; - private native void init(Parcel source); + private native void init(Parcel source) throws OutOfResourcesException; private native void initFromSurfaceTexture(SurfaceTexture surfaceTexture); |