提交: f4471d52dec4a39f008ea40368ab68bbb911e113 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修订版: f4471d52dec4a39f008ea40368ab68bbb911e113 (tree)
• 时间: 2011-11-17 01:58:39
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge branch 'aosp/honeycomb-LTE-release' into honeycomb-mr2-x86

更改概述

• modified: Android.mk
• modified: CleanSpec.mk
• modified: api/13.xml
• modified: cmds/dumpstate/dumpstate.c
• modified: core/java/android/app/Notification.java
• modified: core/java/android/bluetooth/BluetoothDeviceProfileState.java
• modified: core/java/android/bluetooth/BluetoothProfileState.java
• modified: core/java/android/bluetooth/BluetoothTetheringDataTracker.java
• modified: core/java/android/net/ConnectivityManager.java
• modified: core/java/android/net/DhcpInfoInternal.java
• modified: core/java/android/net/DhcpStateMachine.java
• modified: core/java/android/net/DummyDataStateTracker.java
• modified: core/java/android/net/EthernetDataTracker.java
• modified: core/java/android/net/IConnectivityManager.aidl
• modified: core/java/android/net/LinkAddress.java
• modified: core/java/android/net/LinkProperties.java
• modified: core/java/android/net/MobileDataStateTracker.java
• add: core/java/android/net/NetworkConfig.java
• modified: core/java/android/net/NetworkInfo.java
• modified: core/java/android/net/NetworkStateTracker.java
• modified: core/java/android/net/NetworkUtils.java
• modified: core/java/android/net/ProxyProperties.java
• add: core/java/android/net/RouteInfo.aidl
• add: core/java/android/net/RouteInfo.java
• modified: core/java/android/nfc/INfcAdapter.aidl
• modified: core/java/android/nfc/NfcAdapter.java
• delete: core/java/android/nfc/NfcSecureElement.java
• delete: core/java/android/nfc/{INfcSecureElement.aidl => INfcAdapterExtras.aidl}
• modified: core/java/android/os/FileUtils.java
• modified: core/java/android/os/INetworkManagementService.aidl
• modified: core/java/android/provider/Settings.java
• modified: core/java/android/provider/Telephony.java
• modified: core/java/android/view/ViewRoot.java
• modified: core/java/android/webkit/DeviceMotionService.java
• modified: core/java/android/webkit/DeviceOrientationService.java
• modified: core/java/com/android/internal/util/AsyncChannel.java
• delete: core/java/com/android/internal/util/ProcessedMessages.java
• modified: core/java/com/android/internal/util/Protocol.java
• add: core/java/com/android/internal/util/State.java
• delete: core/java/com/android/internal/util/{HierarchicalState.java => IState.java}
• delete: core/java/com/android/internal/util/{HierarchicalStateMachine.java => StateMachine.java}
• modified: core/java/com/android/internal/widget/LockPatternUtils.java
• modified: core/java/com/google/android/mms/pdu/PduParser.java
• modified: core/java/com/google/android/mms/util/PduCache.java
• modified: core/jni/android_net_NetUtils.cpp
• modified: core/jni/android_net_TrafficStats.cpp
• modified: core/jni/android_util_Binder.cpp
• modified: core/res/AndroidManifest.xml
• add: core/res/res/layout/keyguard_screen_sim_puk_landscape.xml
• add: core/res/res/layout/keyguard_screen_sim_puk_portrait.xml
• modified: core/res/res/values/config.xml
• modified: core/res/res/values/strings.xml
• modified: core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java
• add: core/tests/coretests/src/android/net/LinkPropertiesTest.java
• modified: core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java
• delete: core/tests/coretests/src/com/android/internal/util/{HierarchicalStateMachineTest.java => StateMachineTest.java}
• modified: data/etc/platform.xml
• modified: docs/html/guide/guide_toc.cs
• modified: docs/html/guide/publishing/publishing.jd
• modified: docs/html/guide/topics/graphics/index.jd
• modified: docs/html/guide/topics/graphics/opengl.jd
• modified: docs/html/index.jd
• modified: docs/html/resources/dashboard/opengl.jd
• modified: docs/html/resources/dashboard/platform-versions.jd
• modified: docs/html/resources/dashboard/screens.jd
• modified: docs/html/resources/tutorials/views/hello-spinner.jd
• modified: docs/html/sdk/android-3.1-highlights.jd
• modified: docs/html/sdk/eclipse-adt.jd
• modified: docs/html/sdk/index.jd
• modified: docs/html/sdk/ndk/index.jd
• modified: docs/html/sdk/ndk/overview.jd
• modified: docs/html/sdk/sdk_toc.cs
• modified: docs/html/sdk/tools-notes.jd
• modified: media/libstagefright/HTTPStream.cpp
• add: nfc-extras/Android.mk
• add: nfc-extras/com.android.nfc_extras.xml
• add: nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java
• add: nfc-extras/java/com/android/nfc_extras/NfcExecutionEnvironment.java
• modified: packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
• add: packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4g.png
• modified: packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
• modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
• modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
• modified: policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
• modified: policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
• modified: policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
• modified: policy/src/com/android/internal/policy/impl/LockPatternKeyguardViewProperties.java
• modified: policy/src/com/android/internal/policy/impl/LockScreen.java
• add: policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java
• modified: policy/src/com/android/internal/policy/impl/SimUnlockScreen.java
• modified: services/java/com/android/server/ConnectivityService.java
• modified: services/java/com/android/server/NetworkManagementService.java
• modified: services/java/com/android/server/TelephonyRegistry.java
• modified: services/java/com/android/server/WifiService.java
• modified: services/java/com/android/server/connectivity/Tethering.java
• modified: telephony/java/android/telephony/ServiceState.java
• modified: telephony/java/android/telephony/SignalStrength.java
• modified: telephony/java/android/telephony/TelephonyManager.java
• add: telephony/java/com/android/internal/telephony/ApnContext.java
• modified: telephony/java/com/android/internal/telephony/ApnSetting.java
• modified: telephony/java/com/android/internal/telephony/BaseCommands.java
• modified: telephony/java/com/android/internal/telephony/CallTracker.java
• modified: telephony/java/com/android/internal/telephony/CommandsInterface.java
• modified: telephony/java/com/android/internal/telephony/DataCallState.java
• modified: telephony/java/com/android/internal/telephony/DataConnection.java
• add: telephony/java/com/android/internal/telephony/DataConnectionAc.java
• modified: telephony/java/com/android/internal/telephony/DataConnectionTracker.java
• modified: telephony/java/com/android/internal/telephony/DefaultPhoneNotifier.java
• modified: telephony/java/com/android/internal/telephony/ITelephony.aidl
• modified: telephony/java/com/android/internal/telephony/IccCard.java
• modified: telephony/java/com/android/internal/telephony/IccCardApplication.java
• modified: telephony/java/com/android/internal/telephony/IccCardStatus.java
• modified: telephony/java/com/android/internal/telephony/IccConstants.java
• modified: telephony/java/com/android/internal/telephony/IccFileHandler.java
• modified: telephony/java/com/android/internal/telephony/IccRecords.java
• modified: telephony/java/com/android/internal/telephony/IccUtils.java
• modified: telephony/java/com/android/internal/telephony/MccTable.java
• modified: telephony/java/com/android/internal/telephony/Phone.java
• modified: telephony/java/com/android/internal/telephony/PhoneBase.java
• modified: telephony/java/com/android/internal/telephony/PhoneFactory.java
• modified: telephony/java/com/android/internal/telephony/PhoneProxy.java
• modified: telephony/java/com/android/internal/telephony/RIL.java
• modified: telephony/java/com/android/internal/telephony/RILConstants.java
• modified: telephony/java/com/android/internal/telephony/RetryManager.java
• modified: telephony/java/com/android/internal/telephony/SMSDispatcher.java
• modified: telephony/java/com/android/internal/telephony/ServiceStateTracker.java
• modified: telephony/java/com/android/internal/telephony/TelephonyProperties.java
• modified: telephony/java/com/android/internal/telephony/cat/CatService.java
• modified: telephony/java/com/android/internal/telephony/cat/CommandParamsFactory.java
• modified: telephony/java/com/android/internal/telephony/cat/ResponseData.java
• modified: telephony/java/com/android/internal/telephony/cat/RilMessageDecoder.java
• add: telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
• modified: telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
• modified: telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
• modified: telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java
• modified: telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
• modified: telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
• add: telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
• add: telephony/java/com/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
• add: telephony/java/com/android/internal/telephony/cdma/CdmaLteUiccRecords.java
• modified: telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
• modified: telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
• modified: telephony/java/com/android/internal/telephony/cdma/RuimCard.java
• modified: telephony/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
• modified: telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
• modified: telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
• modified: telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
• modified: telephony/java/com/android/internal/telephony/gsm/GsmConnection.java
• modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
• modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
• modified: telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java
• modified: telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
• modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
• modified: telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
• modified: telephony/java/com/android/internal/telephony/gsm/SimCard.java
• modified: telephony/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
• modified: telephony/java/com/android/internal/telephony/sip/SipCommandInterface.java
• modified: telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
• modified: telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
• delete: telephony/java/com/android/internal/telephony/{gsm => }/RestrictedState.java
• modified: tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
• modified: vpn/java/com/android/server/vpn/VpnService.java
• modified: wifi/java/android/net/wifi/SupplicantStateTracker.java
• modified: wifi/java/android/net/wifi/WifiConfigStore.java
• modified: wifi/java/android/net/wifi/WifiStateMachine.java
• modified: wifi/java/android/net/wifi/WifiStateTracker.java
• modified: wifi/java/android/net/wifi/WpsStateMachine.java