fix bugs + aosp framework