Modified /frameworks/base/services/java part