diff options
| author | 2014-11-21 14:19:06 -0800 | |
|---|---|---|
| committer | 2014-11-21 14:19:06 -0800 | |
| commit | 2ab8298dc37851aab4623ba3f98d71055d653a73 (patch) | |
| tree | e31d76f1c16ec8e980983392b09287515bcec2f1 /libs/hwui/StatefulBaseRenderer.h | |
| parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 (diff) | |
| parent | 99377df12ee696e01cd9071132f122801a9862ce (diff) | |
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
Diffstat (limited to 'libs/hwui/StatefulBaseRenderer.h')
| -rw-r--r-- | libs/hwui/StatefulBaseRenderer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/StatefulBaseRenderer.h b/libs/hwui/StatefulBaseRenderer.h index 745e48a8759f..a8e4f883b8c8 100644 --- a/libs/hwui/StatefulBaseRenderer.h +++ b/libs/hwui/StatefulBaseRenderer.h @@ -129,7 +129,8 @@ protected: * * Subclasses can override this method to handle layer restoration */ - virtual void onSnapshotRestored(const Snapshot& removed, const Snapshot& restored) {}; + virtual void onSnapshotRestored(const Snapshot& /* removed */, + const Snapshot& /* restored */) {}; virtual void onViewportInitialized() {}; |