git.osdn.net Git - android-x86/frameworks-base.git/commit

Merge commit 'b5375056fea6c40a2469f48e2497948fb5927b9b' into AOSP_MERGE_NMF26O

Conflicts:
cmds/bootanimation/Android.mk
cmds/bootanimation/BootAnimation.cpp
cmds/idmap/scan.cpp
core/java/android/app/DownloadManager.java
core/java/android/bluetooth/BluetoothHeadset.java
core/java/android/provider/Settings.java
core/java/android/widget/PopupWindow.java
core/jni/android_hardware_Camera.cpp
core/jni/android_media_AudioFormat.h
core/jni/fd_utils-inl.h
core/res/AndroidManifest.xml
core/res/res/values-ar/strings.xml
core/res/res/values-bn-rBD/strings.xml
core/res/res/values-de/strings.xml
core/res/res/values-es-rUS/strings.xml
core/res/res/values-es/strings.xml
core/res/res/values-fa/strings.xml
core/res/res/values-fr/strings.xml
core/res/res/values-gu-rIN/strings.xml
core/res/res/values-hi/strings.xml
core/res/res/values-in/strings.xml
core/res/res/values-it/strings.xml
core/res/res/values-km-rKH/strings.xml
core/res/res/values-kn-rIN/strings.xml
core/res/res/values-ko/strings.xml
core/res/res/values-lo-rLA/strings.xml
core/res/res/values-ml-rIN/strings.xml
core/res/res/values-mr-rIN/strings.xml
core/res/res/values-my-rMM/strings.xml
core/res/res/values-pa-rIN/strings.xml
core/res/res/values-pl/strings.xml
core/res/res/values-pt/strings.xml
core/res/res/values-ro/strings.xml
core/res/res/values-ru/strings.xml
core/res/res/values-sk/strings.xml
core/res/res/values-sl/strings.xml
core/res/res/values-sr/strings.xml
core/res/res/values-sw/strings.xml
core/res/res/values-ta-rIN/strings.xml
core/res/res/values-te-rIN/strings.xml
core/res/res/values-th/strings.xml
core/res/res/values-tl/strings.xml
core/res/res/values-tr/strings.xml
core/res/res/values-uk/strings.xml
core/res/res/values-ur-rPK/strings.xml
core/res/res/values-vi/strings.xml
core/res/res/values-zh-rCN/strings.xml
core/res/res/values-zh-rHK/strings.xml
core/res/res/values-zh-rTW/strings.xml
core/res/res/values/config.xml
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
media/java/android/media/MediaFile.java
media/java/android/media/SoundPool.java
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml
packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml
packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g_plus.xml
packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte_plus.xml
packages/SystemUI/res/values/config.xml
packages/SystemUI/res/values/strings.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
services/core/java/com/android/server/AlarmManagerService.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/LockSettingsService.java
services/core/java/com/android/server/NetworkManagementService.java
services/core/java/com/android/server/connectivity/Tethering.java
services/core/java/com/android/server/display/LocalDisplayAdapter.java
services/core/java/com/android/server/location/GpsXtraDownloader.java
services/core/java/com/android/server/notification/NotificationManagerService.java
services/core/java/com/android/server/notification/ScheduleConditionProvider.java
services/core/java/com/android/server/pm/PackageManagerService.java
services/java/com/android/server/SystemServer.java
telecomm/java/android/telecom/Conference.java
telephony/java/android/telephony/CarrierConfigManager.java
telephony/java/android/telephony/DisconnectCause.java
telephony/java/android/telephony/RadioAccessFamily.java
telephony/java/android/telephony/ServiceState.java
telephony/java/com/android/internal/telephony/ITelephony.aidl
telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I1791555fc835fe7f725012b295b9817f693e379f

author	Lalit Kansara <lkansara@codeaurora.org>
	Tue, 6 Dec 2016 10:16:11 +0000 (15:46 +0530)
committer	Lalit Kansara <lkansara@codeaurora.org>
	Tue, 6 Dec 2016 10:16:11 +0000 (15:46 +0530)
commit	0ec8cdfebf430286f894b463030a692f56724a85
tree	7b44373ffe44941b65d8c364e368799884ec2e14	tree \| snapshot
parent	225b51906b182d635f7abc075e605d9f4f1f5831	commit \| diff
parent	b5375056fea6c40a2469f48e2497948fb5927b9b	commit \| diff

Android.mk	diff1 \|	diff2 \|	blob \| history
cmds/bootanimation/Android.mk	diff1 \|	diff2 \|	blob \| history
cmds/bootanimation/BootAnimation.cpp	diff1 \|	diff2 \|	blob \| history
cmds/bootanimation/BootAnimation.h	diff1 \|	diff2 \|	blob \| history
cmds/idmap/scan.cpp	diff1 \|	diff2 \|	blob \| history
core/java/android/accounts/AccountManager.java	diff1 \|	diff2 \|	blob \| history
core/java/android/app/Activity.java	diff1 \|	diff2 \|	blob \| history
core/java/android/app/ActivityManager.java	diff1 \|	diff2 \|	blob \| history
core/java/android/app/backup/BackupAgent.java	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothAdapter.java	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothDevice.java	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothSocket.java	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/IBluetoothManager.aidl	diff1 \|	diff2 \|	blob \| history
core/java/android/content/ContentResolver.java	diff1 \|	diff2 \|	blob \| history
core/java/android/content/pm/PackageParser.java	diff1 \|	diff2 \|	blob \| history
core/java/android/hardware/usb/UsbManager.java	diff1 \|	diff2 \|	blob \| history
core/java/android/net/ConnectivityManager.java	diff1 \|	diff2 \|	blob \| history
core/java/android/net/IConnectivityManager.aidl	diff1 \|	diff2 \|	blob \| history
core/java/android/net/NetworkIdentity.java	diff1 \|	diff2 \|	blob \| history
core/java/android/os/INetworkManagementService.aidl	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/CallLog.java	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/ContactsContract.java	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	diff1 \|	diff2 \|	blob \| history
core/java/android/view/SurfaceControl.java	diff1 \|	diff2 \|	blob \| history
core/java/android/view/SurfaceView.java	diff1 \|	diff2 \|	blob \| history
core/java/android/view/View.java	diff1 \|	diff2 \|	blob \| history
core/java/android/view/ViewRootImpl.java	diff1 \|	diff2 \|	blob \| history
core/java/android/widget/AbsListView.java	diff1 \|	diff2 \|	blob \| history
core/java/com/android/internal/util/StateMachine.java	diff1 \|	diff2 \|	blob \| history
core/java/com/android/internal/widget/ILockSettings.aidl	diff1 \|	diff2 \|	blob \| history
core/java/com/android/internal/widget/LockPatternUtils.java	diff1 \|	diff2 \|	blob \| history
core/java/com/android/server/SystemConfig.java	diff1 \|	diff2 \|	blob \| history
core/jni/android_hardware_Camera.cpp	diff1 \|	diff2 \|	blob \| history
core/jni/android_hardware_camera2_CameraMetadata.cpp	diff1 \|	diff2 \|	blob \| history
core/jni/android_media_AudioFormat.h	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-ar/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-bn-rBD/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-de/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-es-rUS/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-es/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-fa/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-fr/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-gu-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-hi/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-in/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-it/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-km-rKH/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-kn-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-ko/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-lo-rLA/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-ml-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-mr-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-my-rMM/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-pa-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-pl/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-pt/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-ro/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-ru/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-sk/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-sl/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-sr/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-sw/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-ta-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-te-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-th/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-tl/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-tr/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-uk/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-ur-rPK/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-vi/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-zh-rCN/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-zh-rHK/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values-zh-rTW/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values/config.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	diff1 \|	diff2 \|	blob \| history
libs/hwui/font/CacheTexture.cpp	diff1 \|	diff2 \|	blob \| history
location/java/android/location/LocationManager.java	diff1 \|	diff2 \|	blob \| history
media/java/android/media/AudioFormat.java	diff1 \|	diff2 \|	blob \| history
media/java/android/media/AudioManager.java	diff1 \|	diff2 \|	blob \| history
media/java/android/media/MediaFile.java	diff1 \|	diff2 \|	blob \| history
media/java/android/media/MediaRecorder.java	diff1 \|	diff2 \|	blob \| history
media/java/android/media/SoundPool.java	diff1 \|	diff2 \|	blob \| history
obex/javax/obex/ClientOperation.java	diff1 \|	diff2 \|	blob \| history
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/res/values-zh-rCN/strings.xml	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/res/values/strings.xml	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/EmergencyButton.java	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java	diff1 \|	diff2 \|	blob \| history
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java	diff1 \|	diff2 \|	blob \| history
packages/SettingsLib/res/values/strings.xml	diff1 \|	diff2 \|	blob \| history
packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java	diff1 \|	diff2 \|	blob \| history
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java	diff1 \|	diff2 \|	blob \| history
packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java	diff1 \|	diff2 \|	blob \| history
packages/SettingsProvider/res/values/defaults.xml	diff1 \|	diff2 \|	blob \| history
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java	diff1 \|	diff2 \|	blob \| history
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/layout/status_bar.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/layout/status_bar_expanded.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/values-zh-rCN/strings.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/values-zh-rTW/strings.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/values/config.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/values/dimens.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/values/strings.xml	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/assist/AssistManager.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/qs/QSTile.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/tests/Android.mk	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/AlarmManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/AppOpsService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/BluetoothManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/ConnectivityService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/DeviceIdleController.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/GestureLauncherService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/LocationManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/LockSettingsService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/MountService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/NetworkManagementService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/accounts/AccountManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActiveServices.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityStack.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityStackSupervisor.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/AppErrors.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ProcessList.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ProcessRecord.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/audio/AudioService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/connectivity/Tethering.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/content/SyncStorageEngine.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/display/LocalDisplayAdapter.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/media/MediaSessionRecord.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/net/NetworkPolicyManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/net/NetworkStatsService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/notification/NotificationManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/notification/ScheduleConditionProvider.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/policy/GlobalActions.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/policy/PhoneWindowManager.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/power/PowerManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/power/ShutdownThread.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/SystemServer.java	diff1 \|	diff2 \|	blob \| history
services/usb/java/com/android/server/usb/UsbDeviceManager.java	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecom/Call.java	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecom/Conference.java	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecom/Connection.java	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecom/ConnectionService.java	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecom/TelecomManager.java	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/DisconnectCause.java	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/PhoneNumberUtils.java	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/ServiceState.java	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/ims/ImsReasonInfo.java	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/ISms.aidl	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/ITelephony.aidl	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/RILConstants.java	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/WifiConfiguration.java	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/WifiManager.java	diff1 \|	diff2 \|	blob \| history