am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo

Merge commit 'bbc6e33b1f7fff3280c3fa44836833f4bab4bf99' into froyo-plus-aosp

* commit 'bbc6e33b1f7fff3280c3fa44836833f4bab4bf99':
  Adds back the finalize method on the replaced Paint class.
This commit is contained in:
Xavier Ducrohet
2010-04-08 22:39:24 -07:00
committed by Android Git Automerger

View File

@@ -208,6 +208,12 @@ public class Paint extends _Original_Paint {
this(0); this(0);
} }
/*
* Do not remove or com.android.layoutlib.bridge.TestClassReplacement fails.
*/
@Override
public void finalize() { }
public Paint(int flags) { public Paint(int flags) {
setFlags(flags | DEFAULT_PAINT_FLAGS); setFlags(flags | DEFAULT_PAINT_FLAGS);
initFont(); initFont();