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

Commit 9be49515 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.3_r2.1' into HEAD 

Android 4.3 release 2.1

Conflicts:
	Android.mk
	cmds/input/src/com/android/commands/input/Input.java
	cmds/installd/commands.c
	cmds/installd/installd.c
	cmds/installd/installd.h
	cmds/installd/utils.c
	cmds/servicemanager/Android.mk
	cmds/servicemanager/service_manager.c
	core/java/android/app/ActivityManagerNative.java
	core/java/android/app/ContextImpl.java
	core/java/android/app/IActivityManager.java
	core/java/android/app/admin/DevicePolicyManager.java
	core/java/android/content/ContentProvider.java
	core/java/android/content/Context.java
	core/java/android/content/Intent.java
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/pm/PackageManager.java
	core/java/android/content/pm/PackageUserState.java
	core/java/android/content/res/Resources.java
	core/java/android/os/Trace.java
	core/java/android/provider/Settings.java
	core/java/android/text/format/DateUtils.java
	core/java/android/view/IWindowManager.aidl
	core/java/android/view/inputmethod/InputMethodManager.java
	core/java/android/webkit/BrowserFrame.java
	core/java/android/webkit/WebSettings.java
	core/java/com/android/internal/policy/PolicyManager.java
	core/java/com/android/internal/widget/LockPatternView.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/jni/android_media_AudioTrack.cpp
	core/res/AndroidManifest.xml
	core/res/res/layout-sw600dp/keyguard_screen_status_land.xml
	core/res/res/layout-sw600dp/keyguard_screen_status_port.xml
	core/res/res/layout/keyguard_screen_tab_unlock.xml
	core/res/res/layout/keyguard_screen_tab_unlock_land.xml
	core/res/res/values-cs/strings.xml
	core/res/res/values-fi/strings.xml
	core/res/res/values-pt-rPT/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-ro/strings.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	data/etc/platform.xml
	data/sounds/NewAudio.mk
	libs/androidfw/AssetManager.cpp
	libs/hwui/OpenGLRenderer.cpp
	media/java/android/media/AudioRecord.java
	media/java/android/media/AudioService.java
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
	packages/SystemUI/res/layout/navigation_bar.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/layout/system_bar_notification_area.xml
	packages/SystemUI/res/values-sv/strings.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/donottranslate.xml
	packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
	packages/SystemUI/src/com/android/systemui/SearchPanelView.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsTileView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/PatternUnlockScreen.java
	services/java/com/android/server/DevicePolicyManagerService.java
	services/java/com/android/server/DeviceStorageMonitorService.java
	services/java/com/android/server/LocationManagerService.java
	services/java/com/android/server/LockSettingsService.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/ThrottleService.java
	services/java/com/android/server/VibratorService.java
	services/java/com/android/server/am/ActivityManagerService.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/am/BroadcastQueue.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/pm/PackageSettingBase.java
	services/java/com/android/server/pm/SELinuxMMAC.java
	services/java/com/android/server/pm/Settings.java
	services/java/com/android/server/wifi/WifiService.java
	services/java/com/android/server/wm/ScreenRotationAnimation.java
	services/java/com/android/server/wm/WindowManagerService.java
	services/jni/com_android_server_BatteryService.cpp
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl
	telephony/java/com/android/internal/telephony/RILConstants.java
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
	wifi/java/android/net/wifi/p2p/WifiP2pService.java

Change-Id: I5e9e6aaa4df5f1e256db6084a211a2582ac4454a
parents a37ddac8 a34a64d2

Android.mk

+70 −46
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IThumbnailReceiver.aidl \

	core/java/android/app/IThumbnailRetriever.aidl \

	core/java/android/app/ITransientNotification.aidl \

	core/java/android/app/IUiAutomationConnection.aidl \

	core/java/android/app/IUiModeManager.aidl \

	core/java/android/app/IUserSwitchObserver.aidl \

	core/java/android/app/IWallpaperManager.aidl \
@@ -99,6 +100,9 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothManagerCallback.aidl \

	core/java/android/bluetooth/IBluetoothPbap.aidl \

	core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \

	core/java/android/bluetooth/IBluetoothGatt.aidl \

	core/java/android/bluetooth/IBluetoothGattCallback.aidl \

	core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \

	core/java/android/content/IClipboard.aidl \

	core/java/android/content/IContentService.aidl \

	core/java/android/content/IIntentReceiver.aidl \
@@ -119,10 +123,12 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/display/IDisplayManagerCallback.aidl \

	core/java/android/hardware/input/IInputManager.aidl \

	core/java/android/hardware/input/IInputDevicesChangedListener.aidl \

	core/java/android/hardware/location/IGeofenceHardware.aidl \

	core/java/android/hardware/location/IGeofenceHardwareCallback.aidl \

	core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl \

	core/java/android/hardware/usb/IUsbManager.aidl \

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

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

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

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

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

	core/java/android/net/INetworkStatsService.aidl \
@@ -143,6 +149,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IUpdateLock.aidl \

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

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

	core/java/android/service/notification/INotificationListener.aidl \

	core/java/android/service/dreams/IDreamManager.aidl \

	core/java/android/service/dreams/IDreamService.aidl \

	core/java/android/service/pie/IPieService.aidl \
@@ -156,18 +163,22 @@ LOCAL_SRC_FILES += \ 
	core/java/android/view/accessibility/IAccessibilityManager.aidl \

	core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \

	core/java/android/view/IApplicationToken.aidl \

	core/java/android/view/IDisplayContentChangeListener.aidl \

	core/java/android/view/IMagnificationCallbacks.aidl \

	core/java/android/view/IInputFilter.aidl \

	core/java/android/view/IInputFilterHost.aidl \

	core/java/android/view/IOnKeyguardExitResult.aidl \

	core/java/android/view/IRotationWatcher.aidl \

	core/java/android/view/IWindow.aidl \

	core/java/android/view/IWindowFocusObserver.aidl \

	core/java/android/view/IWindowId.aidl \

	core/java/android/view/IWindowManager.aidl \

	core/java/android/view/IWindowSession.aidl \

	core/java/android/speech/IRecognitionListener.aidl \

	core/java/android/speech/IRecognitionService.aidl \

	core/java/android/speech/tts/ITextToSpeechCallback.aidl \

	core/java/android/speech/tts/ITextToSpeechService.aidl \

	core/java/com/android/internal/app/IAppOpsCallback.aidl \

	core/java/com/android/internal/app/IAppOpsService.aidl \

	core/java/com/android/internal/app/IBatteryStats.aidl \

	core/java/com/android/internal/app/IUsageStats.aidl \

	core/java/com/android/internal/app/IMediaContainerService.aidl \
@@ -175,6 +186,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/appwidget/IAppWidgetService.aidl \

	core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \

	core/java/com/android/internal/backup/IBackupTransport.aidl \

	core/java/com/android/internal/backup/IObbBackupService.aidl \

	core/java/com/android/internal/policy/IFaceLockCallback.aidl \

	core/java/com/android/internal/policy/IFaceLockInterface.aidl \

	core/java/com/android/internal/os/IDropBoxManagerService.aidl \
@@ -189,10 +201,10 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/view/IInputContext.aidl \

	core/java/com/android/internal/view/IInputContextCallback.aidl \

	core/java/com/android/internal/view/IInputMethod.aidl \

	core/java/com/android/internal/view/IInputMethodCallback.aidl \

	core/java/com/android/internal/view/IInputMethodClient.aidl \

	core/java/com/android/internal/view/IInputMethodManager.aidl \

	core/java/com/android/internal/view/IInputMethodSession.aidl \

	core/java/com/android/internal/view/IInputSessionCallback.aidl \

	core/java/com/android/internal/widget/ILockSettings.aidl \

	core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \

	core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \
@@ -201,10 +213,12 @@ LOCAL_SRC_FILES += \ 
	location/java/android/location/ICountryDetector.aidl \

	location/java/android/location/ICountryListener.aidl \

	location/java/android/location/IGeocodeProvider.aidl \

	location/java/android/location/IGeofenceProvider.aidl \

	location/java/android/location/IGpsStatusListener.aidl \

	location/java/android/location/IGpsStatusProvider.aidl \

	location/java/android/location/ILocationListener.aidl \

	location/java/android/location/ILocationManager.aidl \

	location/java/android/location/IGpsGeofenceHardware.aidl \

	location/java/android/location/INetInitiatedListener.aidl \

	location/java/com/android/internal/location/ILocationProvider.aidl \

	media/java/android/media/IAudioService.aidl \
@@ -219,13 +233,11 @@ LOCAL_SRC_FILES += \ 
	telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \

	telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \

	telephony/java/com/android/internal/telephony/ITelephony.aidl \

	telephony/java/com/android/internal/telephony/ISms.aidl \

	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \

	telephony/java/com/android/internal/telephony/IWapPushManager.aidl \

	wifi/java/android/net/wifi/IWifiManager.aidl \

	wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \

	voip/java/android/net/sip/ISipSession.aidl \

	voip/java/android/net/sip/ISipSessionListener.aidl \

	voip/java/android/net/sip/ISipService.aidl \

	fmradio/java/com/stericsson/hardware/fm/IFmReceiver.aidl \

	fmradio/java/com/stericsson/hardware/fm/IFmTransmitter.aidl \

	fmradio/java/com/stericsson/hardware/fm/IOnStateChangedListener.aidl \
@@ -289,15 +301,17 @@ aidl_files := \ 
	frameworks/base/core/java/android/app/NotificationGroup.aidl \

	frameworks/base/core/java/android/app/Profile.aidl \

	frameworks/base/core/java/android/app/PendingIntent.aidl \

	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \

	frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \

	frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \

	frameworks/base/core/java/android/content/ComponentName.aidl \

	frameworks/base/core/java/android/content/ContentValues.aidl \

	frameworks/base/core/java/android/content/Intent.aidl \

	frameworks/base/core/java/android/content/IntentSender.aidl \

	frameworks/base/core/java/android/content/PeriodicSync.aidl \

	frameworks/base/core/java/android/content/SyncStats.aidl \

	frameworks/base/core/java/android/content/res/Configuration.aidl \

	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \

	frameworks/base/core/java/android/database/CursorWindow.aidl \

	frameworks/base/core/java/android/net/Uri.aidl \

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

	frameworks/base/core/java/android/nfc/NdefRecord.aidl \
@@ -318,7 +332,6 @@ aidl_files := \ 
	frameworks/base/core/java/com/android/internal/textservice/ITextServicesSessionListener.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputContext.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethod.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethodCallback.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethodClient.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethodManager.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethodSession.aidl \
@@ -372,6 +385,8 @@ non_base_dirs := \ 
	../../external/apache-http/src/org/apache/http \

	../opt/telephony/src/java/android/telephony \

	../opt/telephony/src/java/android/telephony/gsm \

	../opt/net/voip/src/java/android/net/rtp \

	../opt/net/voip/src/java/android/net/sip



# These are relative to frameworks/base

dirs_to_check_apis := \
@@ -417,13 +432,18 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ 
	$(framework_res_source_path)/android/Manifest.java \

	$(framework_res_source_path)/com/android/internal/R.java



framework_docs_LOCAL_JAVA_LIBRARIES := \

framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \

	bouncycastle \

	core \

	ext \

	framework \

	mms-common \

	telephony-common \

	voip-common



framework_docs_LOCAL_JAVA_LIBRARIES := \

	$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) \

	$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES)



framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES

framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
@@ -431,27 +451,34 @@ framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html 
# to the reference documentation. Must be in order of oldest to newest.

framework_docs_LOCAL_DROIDDOC_OPTIONS := \

    -knowntags ./frameworks/base/docs/knowntags.txt \

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

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

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

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

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

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

    -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 \

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

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

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

    -since ./frameworks/base/api/14.txt 14 \

    -since ./frameworks/base/api/15.txt 15 \

    -since ./frameworks/base/api/16.txt 16 \

    -since ./frameworks/base/api/17.txt 17 \

    -since $(SRC_API_DIR)/1.xml 1 \

    -since $(SRC_API_DIR)/2.xml 2 \

    -since $(SRC_API_DIR)/3.xml 3 \

    -since $(SRC_API_DIR)/4.xml 4 \

    -since $(SRC_API_DIR)/5.xml 5 \

    -since $(SRC_API_DIR)/6.xml 6 \

    -since $(SRC_API_DIR)/7.xml 7 \

    -since $(SRC_API_DIR)/8.xml 8 \

    -since $(SRC_API_DIR)/9.xml 9 \

    -since $(SRC_API_DIR)/10.xml 10 \

    -since $(SRC_API_DIR)/11.xml 11 \

    -since $(SRC_API_DIR)/12.xml 12 \

    -since $(SRC_API_DIR)/13.xml 13 \

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

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

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

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

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

		-werror -hide 113 \

		-overview $(LOCAL_PATH)/core/java/overview.html



framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON)

framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \

	$(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON)



framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \

	$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR) \

	$(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)) \

	$(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib)-res,,COMMON))



framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \

    frameworks/base/docs/knowntags.txt
@@ -573,11 +600,11 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) framework

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) framework

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)

LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := api-stubs
@@ -626,7 +653,9 @@ include $(BUILD_DROIDDOC) 
# $(gen), i.e. framework.aidl, is also needed while building against the current stub.

$(full_target): $(framework_built) $(gen)



droidcore: doc-comment-check-docs

# Run this for checkbuild

.PHONY: checkbuild

checkbuild: doc-comment-check-docs



# ====  static html in the sdk ==================================

include $(CLEAR_VARS)
@@ -678,6 +707,7 @@ LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) 
LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /intl/



LOCAL_MODULE := online-sdk
@@ -692,9 +722,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk 


include $(BUILD_DROIDDOC)



# explicitly specify that online-sdk depends on framework-res and any generated docs

$(full_target): framework-res-package-target



# ==== docs for the web (on the devsite app engine server) =======================

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
@@ -723,9 +750,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk 


include $(BUILD_DROIDDOC)



# explicitly specify that ds depends on framework-res and any generated docs

$(full_target): framework-res-package-target



# ==== docs that have all of the stuff that's @hidden =======================

include $(CLEAR_VARS)

CleanSpec.mk

+21 −0
Original line number Diff line number Diff line
@@ -137,9 +137,30 @@ $(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/APPS/ImageProcessing_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing2_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ui/*.ogg)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.P)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)

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

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

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

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

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

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

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

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

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/voip)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/librtp_jni_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/librtp_jni.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/librtp_jni.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/librtp_jni.so)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/SmsRawData.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/view/IInputMethodCallback.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/view/IInputMethodSession.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/view/IInputMethodCallback.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

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

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

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

api/1.xml

deleted100644 → 0
+0 −311265

File deleted.

Preview size limit exceeded, changes collapsed.

api/10.xml

deleted100644 → 0
+0 −420882

File deleted.

Preview size limit exceeded, changes collapsed.

api/11.xml

deleted100644 → 0
+0 −456842

File deleted.

Preview size limit exceeded, changes collapsed.