Merge "Remove final from phone"
diff --git a/Android.mk b/Android.mk
index 616d617..ce45497 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,44 +15,14 @@
#
LOCAL_PATH:= $(call my-dir)
+
include $(CLEAR_VARS)
-# $(1): sdk version
-define _copy_prebuilt_sdk_to_the_right_place
-_cpsttrp_src_jar := $(LOCAL_PATH)/$(1)/android.jar
-_cpsttrp_sdk_intermediates := $(call intermediates-dir-for,JAVA_LIBRARIES,sdk_v$(1),,COMMON)
-$$(_cpsttrp_sdk_intermediates)/classes.jar : $$(_cpsttrp_src_jar) | $(ACP)
- $$(call copy-file-to-target)
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+ $(foreach s,$(TARGET_AVAILABLE_SDK_VERSIONS),\
+ sdk_v$(s):$(s)/android.jar \
+ uiautomator_sdk_v$(s):$(s)/uiautomator.jar)
-$$(_cpsttrp_sdk_intermediates)/classes.jack: PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
-$$(_cpsttrp_sdk_intermediates)/classes.jack: PRIVATE_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS) -D jack.classpath.default-libraries=false
-$$(_cpsttrp_sdk_intermediates)/classes.jack : $$(_cpsttrp_src_jar) $(JILL_JAR) $(JACK_JAR)
- $$(call transform-jar-to-jack)
-
-$$(_cpsttrp_sdk_intermediates)/javalib.jar : $$(_cpsttrp_sdk_intermediates)/classes.jar | $(ACP)
- $$(call copy-file-to-target)
-
-# The uiautomator.jar
-_cpsttrp_src_jar := $(LOCAL_PATH)/$(1)/uiautomator.jar
-# The uiautomator library should be referenced as "LOCAL_JAVA_LIBRARIES += uiautomator_sdk_v<version>".
-_cpsttrp_sdk_intermediates := $(call intermediates-dir-for,JAVA_LIBRARIES,uiautomator_sdk_v$(1),,COMMON)
-$$(_cpsttrp_sdk_intermediates)/classes.jar : $$(_cpsttrp_src_jar) | $(ACP)
- $$(call copy-file-to-target)
-
-$$(_cpsttrp_sdk_intermediates)/classes.jack: PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
-$$(_cpsttrp_sdk_intermediates)/classes.jack: PRIVATE_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)
-$$(_cpsttrp_sdk_intermediates)/classes.jack : $$(_cpsttrp_src_jar) $(JILL_JAR) $(JACK_JAR)
- $$(call transform-jar-to-jack)
-
-$$(_cpsttrp_sdk_intermediates)/javalib.jar : $$(_cpsttrp_sdk_intermediates)/classes.jar | $(ACP)
- $$(call copy-file-to-target)
-endef
-
-$(foreach s,$(TARGET_AVAILABLE_SDK_VERSIONS),$(eval $(call _copy_prebuilt_sdk_to_the_right_place,$(s))))
-
-# Make sure we install the prebuilt current sdk when you do a checkbuild
-# so later users can run tapas and mm/mmm on an Android.mk with "LOCAL_SDK_VERSION := current".
-# That Android.mk may not be visible to platform build.
-checkbuild : $(call intermediates-dir-for,JAVA_LIBRARIES,sdk_vcurrent,,COMMON)/classes.jar
+include $(BUILD_MULTI_PREBUILT)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/system-api/23.txt b/system-api/23.txt
index f79d6ef..3f8da88 100644
--- a/system-api/23.txt
+++ b/system-api/23.txt
@@ -30262,9 +30262,9 @@
method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();
method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String);
method public java.util.List<android.telecom.PhoneAccountHandle> getRegisteredConnectionManagers();
+ method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle);
method public boolean handleMmi(java.lang.String);
method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
- method public boolean hasVoiceMailNumber(android.telecom.PhoneAccountHandle);
method public boolean isInCall();
method public boolean isRinging();
method public boolean isTtySupported();