diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-11 18:27:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 18:28:07 +0000 |
| commit | 2cad64c0fbeba07bb546674e19cfb0166d7ec332 (patch) | |
| tree | 7ec5d5625c648ea459f4c4ec17917dae633e26f2 /services/java/com/android/server/wm/DisplayMagnifier.java | |
| parent | 444ae3a2e66b4404fa715ab46403da09079dd572 (diff) | |
| parent | a86ab640f7bb0bf3cb4eaed80473ca8c5d131903 (diff) | |
| download | frameworks_base-2cad64c0fbeba07bb546674e19cfb0166d7ec332.zip frameworks_base-2cad64c0fbeba07bb546674e19cfb0166d7ec332.tar.gz frameworks_base-2cad64c0fbeba07bb546674e19cfb0166d7ec332.tar.bz2 | |
Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev
Diffstat (limited to 'services/java/com/android/server/wm/DisplayMagnifier.java')
| -rw-r--r-- | services/java/com/android/server/wm/DisplayMagnifier.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/wm/DisplayMagnifier.java b/services/java/com/android/server/wm/DisplayMagnifier.java index 0f51028..382d7b4 100644 --- a/services/java/com/android/server/wm/DisplayMagnifier.java +++ b/services/java/com/android/server/wm/DisplayMagnifier.java @@ -496,7 +496,7 @@ final class DisplayMagnifier { mWindowManager.getDefaultDisplay().getRealSize(mTempPoint); surfaceControl = new SurfaceControl(mWindowManagerService.mFxSession, SURFACE_TITLE, mTempPoint.x, mTempPoint.y, PixelFormat.TRANSLUCENT, SurfaceControl.HIDDEN); - } catch (SurfaceControl.OutOfResourcesException oore) { + } catch (OutOfResourcesException oore) { /* ignore */ } mSurfaceControl = surfaceControl; @@ -629,7 +629,7 @@ final class DisplayMagnifier { } } catch (IllegalArgumentException iae) { /* ignore */ - } catch (OutOfResourcesException oore) { + } catch (Surface.OutOfResourcesException oore) { /* ignore */ } if (canvas == null) { @@ -644,7 +644,7 @@ final class DisplayMagnifier { canvas.drawPath(path, mPaint); mSurface.unlockCanvasAndPost(canvas); - + if (mAlpha > 0) { mSurfaceControl.show(); } else { |