Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19f0656 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.1_r4' into cm-14.1 

Android 7.1.1 release 4

Change-Id: Iaa9c92f659788db6c116e25438418022162753fe
parents 66d837f1 3570784f

Android.mk

+46 −7
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/net/ICaptivePortal.aidl \

	core/java/android/net/IConnectivityManager.aidl \

	core/java/android/net/IConnectivityMetricsLogger.aidl \

	core/java/android/net/IIpConnectivityMetrics.aidl \

	core/java/android/net/IEthernetManager.aidl \

	core/java/android/net/IEthernetServiceListener.aidl \

	core/java/android/net/INetworkManagementEventObserver.aidl \
@@ -863,6 +864,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since $(SRC_API_DIR)/22.txt 22 \

    -since $(SRC_API_DIR)/23.txt 23 \

    -since $(SRC_API_DIR)/24.txt 24 \

    -since $(SRC_API_DIR)/25.txt 25 \

		-werror -hide 111 -hide 113 \

		-overview $(LOCAL_PATH)/core/java/overview.html
@@ -930,6 +932,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES 


LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-api $(INTERNAL_PLATFORM_API_FILE) \

		-removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \

		-nodocs
@@ -963,6 +966,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES 


LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-showAnnotation android.annotation.SystemApi \

		-api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \

		-removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \
@@ -997,6 +1001,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES 


LOCAL_DROIDDOC_OPTIONS:=\

               $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

               -referenceonly \

               -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_test_stubs_current_intermediates/src \

               -showAnnotation android.annotation.TestApi \

               -api $(INTERNAL_PLATFORM_TEST_API_FILE) \
@@ -1030,6 +1035,7 @@ LOCAL_MODULE := doc-comment-check 


LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-parsecomments



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
@@ -1068,7 +1074,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-sdkvalues $(OUT_DOCS) \

		-hdf android.whichdoc offline



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1105,7 +1111,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-hdf android.whichdoc offline \

		-referenceonly



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1115,7 +1121,14 @@ $(static_doc_index_redirect): \ 
	$(hide) mkdir -p $(dir $@)

	$(hide) $(ACP) $< $@



static_doc_properties := $(out_dir)/source.properties

$(static_doc_properties): \

	$(LOCAL_PATH)/docs/source.properties | $(ACP)

	$(hide) mkdir -p $(dir $@)

	$(hide) $(ACP) $< $@



$(full_target): $(static_doc_index_redirect)

$(full_target): $(static_doc_properties)

$(full_target): $(framework_built)
@@ -1143,7 +1156,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1167,6 +1180,7 @@ LOCAL_MODULE := online-system-api-sdk 


LOCAL_DROIDDOC_OPTIONS:= \

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-showAnnotation android.annotation.SystemApi \

		-title "Android SDK - Including system APIs." \

		-toroot / \
@@ -1210,7 +1224,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1238,7 +1252,32 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-devsite \

		-ignoreJdLinks



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)



# ==== generates full navtree for resolving @links in ds postprocessing ====

include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := ds-ref-navtree



LOCAL_DROIDDOC_OPTIONS:= \

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-hdf android.whichdoc online \

		-toroot / \

		-atLinksNavtree \

		-navtreeonly



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1263,11 +1302,10 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-toroot / \

		-hdf android.whichdoc online \

		$(sample_groups) \

		-useUpdatedTemplates \

		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1286,6 +1324,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) 
LOCAL_MODULE := hidden

LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-title "Android SDK - Including hidden APIs."

#		-hidden

api/current.txt

+567 −567

File changed.

Preview size limit exceeded, changes collapsed.

api/system-current.txt

+567 −567

File changed.

Preview size limit exceeded, changes collapsed.

api/test-current.txt

+576 −567

File changed.

Preview size limit exceeded, changes collapsed.

cmds/bootanimation/audioplay.cpp

+15 −1
Original line number Diff line number Diff line
@@ -141,13 +141,27 @@ bool createBufferQueueAudioPlayer(const ChunkFormat* chunkFormat) { 
    // configure audio source

    SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};



    // Determine channelMask from num_channels

    SLuint32 channelMask;

    switch (chunkFormat->num_channels) {

        case 1:

            channelMask = SL_SPEAKER_FRONT_CENTER;

            break;

        case 2:

            channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;

            break;

        default:

            // Default of 0 will derive mask from num_channels and log a warning.

            channelMask = 0;

    }



    SLDataFormat_PCM format_pcm = {

        SL_DATAFORMAT_PCM,

        chunkFormat->num_channels,

        chunkFormat->sample_rate * 1000,  // convert to milliHz

        chunkFormat->bits_per_sample,

        16,

        SL_SPEAKER_FRONT_CENTER,

        channelMask,

        SL_BYTEORDER_LITTLEENDIAN

    };

    SLDataSource audioSrc = {&loc_bufq, &format_pcm};