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

Commit 0352af01 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'gingerbread' of git://android.git.kernel.org/platform/frameworks/base into 233-merge 

Conflicts:
	api/current.xml
	core/java/android/content/pm/PackageParser.java
	core/java/android/net/ConnectivityManager.java
	core/java/android/widget/TextView.java
	core/java/com/android/internal/os/BatteryStatsImpl.java
	core/res/res/drawable-mdpi/btn_check_off.png
	core/res/res/drawable-mdpi/btn_check_off_disable.png
	core/res/res/drawable-mdpi/btn_check_off_disable_focused.png
	core/res/res/drawable-mdpi/btn_check_off_pressed.png
	core/res/res/drawable-mdpi/btn_check_off_selected.png
	core/res/res/drawable-mdpi/btn_check_on.png
	core/res/res/drawable-mdpi/btn_check_on_disable.png
	core/res/res/drawable-mdpi/btn_check_on_disable_focused.png
	core/res/res/drawable-mdpi/btn_check_on_pressed.png
	core/res/res/drawable-mdpi/btn_check_on_selected.png
	core/res/res/values-ca/strings.xml
	core/res/res/values-de/strings.xml
	core/res/res/values/config.xml
	include/media/AudioSystem.h
	include/media/mediarecorder.h
	media/java/android/media/MediaRecorder.java
	media/libmedia/AudioSystem.cpp
	media/libstagefright/StagefrightMediaScanner.cpp
	media/libstagefright/rtsp/ARTSPConnection.cpp
	media/libstagefright/rtsp/ASessionDescription.cpp
	media/libstagefright/rtsp/MyHandler.h
	policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
	policy/src/com/android/internal/policy/impl/LockScreen.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java
	services/audioflinger/AudioPolicyManagerBase.cpp
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/am/ActivityManagerService.java
	test-runner/src/android/test/mock/MockPackageManager.java
	voip/java/android/net/sip/SipProfile.java
	voip/java/com/android/server/sip/SipService.java
	wifi/java/android/net/wifi/WifiStateTracker.java

Change-Id: Ia65d02a66c6206b5f4ed95c3a64e3f28a03e7329
parents f1df5d9d 322891c6

Android.mk

+9 −5
Original line number Diff line number Diff line
@@ -120,11 +120,11 @@ LOCAL_SRC_FILES += \ 
	core/java/android/nfc/ILlcpConnectionlessSocket.aidl \

	core/java/android/nfc/ILlcpServiceSocket.aidl \

	core/java/android/nfc/ILlcpSocket.aidl \

	core/java/android/nfc/INdefTag.aidl \

	core/java/android/nfc/INfcAdapter.aidl \

	core/java/android/nfc/INfcTag.aidl \

	core/java/android/nfc/IP2pInitiator.aidl \

	core/java/android/nfc/IP2pTarget.aidl \

    core/java/android/nfc/INfcSecureElement.aidl \

	core/java/android/os/IHardwareService.aidl \

	core/java/android/os/IMessenger.aidl \

	core/java/android/os/INetworkManagementService.aidl \
@@ -254,7 +254,6 @@ aidl_files := \ 
	frameworks/base/core/java/android/nfc/NdefMessage.aidl \

	frameworks/base/core/java/android/nfc/NdefRecord.aidl \

	frameworks/base/core/java/android/nfc/Tag.aidl \

	frameworks/base/core/java/android/nfc/NdefTag.aidl \

	frameworks/base/core/java/android/os/Bundle.aidl \

	frameworks/base/core/java/android/os/DropBoxManager.aidl \

	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \
@@ -376,6 +375,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/7.xml 7 \

    -since ./frameworks/base/api/8.xml 8 \

    -since ./frameworks/base/api/9.xml 9 \

    -since ./frameworks/base/api/10.xml 10 \

    -werror -hide 13 \

    -overview $(LOCAL_PATH)/core/java/overview.html
@@ -394,6 +394,8 @@ web_docs_sample_code_flags := \ 
		            resources/samples/AccessibilityService "Accessibility Service" \

		-samplecode $(sample_dir)/ApiDemos \

		            resources/samples/ApiDemos "API Demos" \

		-samplecode $(sample_dir)/AccelerometerPlay \

		            resources/samples/AccelerometerPlay "Accelerometer Play" \

		-samplecode $(sample_dir)/BackupRestore \

		            resources/samples/BackupRestore "Backup and Restore" \

		-samplecode $(sample_dir)/BluetoothChat \
@@ -406,8 +408,6 @@ web_docs_sample_code_flags := \ 
                            resources/samples/CubeLiveWallpaper "Live Wallpaper" \

		-samplecode $(sample_dir)/Home \

		            resources/samples/Home "Home" \

		-samplecode $(sample_dir)/HeavyWeight \

		            resources/samples/HeavyWeight "Heavy Weight App" \

		-samplecode $(sample_dir)/JetBoy \

		            resources/samples/JetBoy "JetBoy" \

		-samplecode $(sample_dir)/LunarLander \
@@ -449,7 +449,7 @@ framework_docs_SDK_VERSION:=2.3 
  # release version (ie "Release x")  (full releases only)

framework_docs_SDK_REL_ID:=1

  # flag to build offline docs for a preview release

framework_docs_SDK_PREVIEW:=0

framework_docs_SDK_PREVIEW:=true



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \
@@ -577,6 +577,10 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-hdf android.whichdoc online \

		-hdf template.showLanguageMenu true



ifeq ($(framework_docs_SDK_PREVIEW),true)

  LOCAL_DROIDDOC_OPTIONS += -hdf sdk.preview true

endif



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

LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/trustedlogic)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc/INdefTag.java)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

NOTICE

+21 −0
Original line number Diff line number Diff line
@@ -51,6 +51,27 @@ the Apache2 License. 


Media Codecs

These files are Copyright 1998 - 2009 PacketVideo, but released under

the Apache2 License.



   =========================================================================

   ==  NOTICE file corresponding to the section 4 d of                    ==

   ==  the Apache License, Version 2.0,                                   ==

   ==  in this case for Additional Codecs code.                           ==

   =========================================================================



Additional Codecs

These files are Copyright 2003-2010 VisualOn, but released under

the Apache2 License.



  =========================================================================

  ==  NOTICE file corresponding to the section 4 d of                    ==

  ==  the Apache License, Version 2.0,                                   ==

  ==  in this case for the Audio Effects code.                           ==

  =========================================================================



Audio Effects

These files are Copyright (C) 2004-2010 NXP Software and

Copyright (C) 2010 The Android Open Source Project, but released under

the Apache2 License.



                               Apache License

api/10.xml

0 → 100644
+420882 −0

File added.

Preview size limit exceeded, changes collapsed.

api/9.xml

+0 −15
Original line number Diff line number Diff line
@@ -157967,21 +157967,6 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="setPackageObbPath"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

<parameter name="path" type="java.lang.String">

</parameter>

</method>

</class>

<class name="MockResources"

 extends="android.content.res.Resources"