Modified /frameworks/base/core/java part