summaryrefslogtreecommitdiffstats
path: root/services/java
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | am 95a7829c: am b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed ↵Dan Sandler2014-03-191-13/+24
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listeners." into klp-dev * commit '95a7829c270fb63ce9255cc9956a3a9b778cc8a2': DO NOT MERGE: Maintain binding to crashed listeners.
| | | | * | | | | | | | | DO NOT MERGE: Maintain binding to crashed listeners.Dan Sandler2014-03-171-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapted from change I44ce250e, "Maintain binding to crashed listeners from NotificationManagerService.": > This fixes the logic on the death handlers for notification > listeners, and doesn't unbind from the listener services so > that the system will bring them back up again. Bug: 12587702 Change-Id: I41d0c6733046ee9760bcfae4407e754592b805ea
| | | * | | | | | | | | | am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when ↵Dianne Hackborn2014-03-181-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | persistent process is killed" * commit 'd1d91eca3e78f2074b110a0e3530aeff6deef6fe': Insufficient ProcessRecord cleanup when persistent process is killed
| | | * \ \ \ \ \ \ \ \ \ \ am 54d5702c: am 477897ad: Merge "Fix incorrect setting of ↵Craig Mautner2014-03-142-21/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev * commit '54d5702cf8e5e7d9fe5794f93b90b6f678ac27bb': Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
| | | | * | | | | | | | | | Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into ↵Craig Mautner2014-03-142-21/+23
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev
| | | | | * | | | | | | | | | Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.Craig Mautner2014-03-142-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord member frontOfTask was being set true incorrectly for the top activity. It should only be true for the bottom activity. This fix ensures that frontOfTask is always set correctly for all activities by consoldating it into one method. Fixes bug 12171535. Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
| | | | * | | | | | | | | | | Merge "Fix activities appearing behind launcher icons" into klp-devCraig Mautner2014-03-141-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Fix activities appearing behind launcher iconsCraig Mautner2014-03-131-0/+1
| | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry picked from d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866 Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0
| | | * | | | | | | | | | | | am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition ↵Mike Lockwood2014-03-141-2/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between accessory start and USB configured uevents" into klp-dev * commit 'ff64f5ed7c2b55878d149d546092e029cba15465': UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
| | | | * | | | | | | | | | | Merge "UsbDeviceManager: Fix race condition between accessory start and USB ↵Mike Lockwood2014-03-131-2/+25
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured uevents" into klp-dev
| | | | | * | | | | | | | | | | UsbDeviceManager: Fix race condition between accessory start and USB ↵Mike Lockwood2014-03-101-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured uevents Bug: 13393825 Change-Id: Ice0ce47b4bd65e453771d44b17352982335e9ebd
| | | * | | | | | | | | | | | | am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"Victoria Lease2014-03-141-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1365d98270e0a0a61d10743820e923aeff974b39': remove unnecessary switchUser call
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP ↵JP Abgrall2014-03-141-0/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial rwnd" into klp-dev * commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4': ConnectivityService: add support to set TCP initial rwnd
| | | | * | | | | | | | | | | | | Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-devJP Abgrall2014-03-131-0/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | ConnectivityService: add support to set TCP initial rwndJP Abgrall2014-03-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value for the TCP initial receive window comes from, in order, kernel /proc/sys/net/ipv4/tcp_default_init_rwnd init.rc (via properties) net.tcp.default_init_rwnd properties net.tcp.default_init_rwnd gservices Settings.Global.TCP_DEFAULT_INIT_RWND Bug: 12020135 Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
| | | * | | | | | | | | | | | | | am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" ↵Chad Brubaker2014-03-142-9/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd': Remove SO_BINDTODEVICE from VPN protect
| | | | * | | | | | | | | | | | | Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-devChad Brubaker2014-03-132-9/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Remove SO_BINDTODEVICE from VPN protectChad Brubaker2014-03-112-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SO_BINDTODEVICE is not needed with policy routing. SO_BINDTODEVICE was also used on the default iface which causes problems when the default iface is IPv6 only and the socket tries to connect to a IPv4 address. Bug: 12940882 Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
| | | * | | | | | | | | | | | | | am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using ↵Dianne Hackborn2014-03-141-0/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IntentChooser are now Broken in 4.3 and 4.4" into klp-dev * commit 'e5191aabff5b9b751349b8634836a858af744905': Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
| | | | * | | | | | | | | | | | | Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 ↵Dianne Hackborn2014-03-131-0/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and 4.4" into klp-dev
| | | | | * | | | | | | | | | | | | Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4Dianne Hackborn2014-03-121-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The activity manager needs to set launchedFromPackage to be that of the previous package in the case where flow has been redirected through an intermediate activity. Change-Id: I678fc2e7d984991ac715251a784ba7d7ccbf9fca
| | | * | | | | | | | | | | | | | | am db3146c0: am 15258ac8: Fix power manager display wake lock bugs. (DO NOT ↵Jeff Brown2014-03-143-55/+67
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE) * commit 'db3146c039750f68418e0908037a8bed3890913c': Fix power manager display wake lock bugs. (DO NOT MERGE)
| | | | * | | | | | | | | | | | | | Fix power manager display wake lock bugs. (DO NOT MERGE)Jeff Brown2014-03-113-55/+67
| | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under certain circumstances, the power manager might continue to hold the display wakelock long after the display had been turned off due to the mDisplayReady flag having an incorrect value. 1. An inverted conditional caused DisplayPowerState to incorrectly signal the screen on ready state. 2. The DisplayPowerController failed to clear the block screen on flag in the case where the screen was turned off before it became unblocked from turning on. This could happen when the display was rapidly turned on-off-on-off. Bug: 13248135 Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
| | | * | | | | | | | | | | | | | am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting ↵Dave Platt2014-03-131-17/+64
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clients" * commit '21384faa2b3da619a54b35f15936c00593b30694': NsdService does not clean up after exiting clients
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 9af19bee to klp-dev-plus-aospBrian Carlstrom2014-03-131-4/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70f34a6523fb43129cfe7d4c7308bc3b7353f57c
| | | | * | | | | | | | | | | | | | DO NOT MERGE - Remove data dirs if a new install fails dexopt.Narayan Kamath2014-03-111-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd otherwise leave the data dirs & native libraries lying around. This will leave the app permanently broken because the next install of the app will fail with INSTALL_FAILED_UID_CHANGED. Also remove an unnecessary instance variable. Cherry-pick from master Bug 13416059 Change-Id: I1e644aab74d5ea519231800915b39c2f55d043ae
| | | | * | | | | | | | | | | | | | DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and ↵Naofumi Harada2014-03-111-0/+6
| | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebooted Since Kitkat, an app pre-loaded under /system/priv-app/ has FLAG_PRIVILEGED. However, if the app updated and the device rebooted, privileged flag is unset from pkgFlags. This patch fix issue to assign privileged flag when scanning the updated packages. Bug: 12640283 Cherrypick from master. Change-Id: I833d94cd911693c9291e8204f63bd8de945dbba6
| | | * | | | | | | | | | | | | | am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt ↵Chad Brubaker2014-03-122-6/+84
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routes" into klp-dev * commit '7fb074389370ac93afc5830189371dc3ec26265c': Only allow System apps to make VPN exempt routes
| | | | * | | | | | | | | | | | | Merge "Only allow System apps to make VPN exempt routes" into klp-devChad Brubaker2014-03-112-6/+84
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Only allow System apps to make VPN exempt routesChad Brubaker2014-03-052-6/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requestRouteToHost will only allow system applications to make routes exempt from the VPN's routing rules. If a VPN is currently running and a non-system app requests a route it will only succeed if that host is currently covered by a VPN exempt routing rule. Otherwise it will fail. For example, if a VPN is running and the MMS network is brought online those routes will be added as VPN exempt. If an application then tries to request a route to a MMS endpoint it will succeed because the routes already exist. If an application tries to request a route to a host covered by the VPN the call will fail. Bug: 12937545 Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
| | | * | | | | | | | | | | | | | | am 1011960c: am decfd707: Merge "Add the calling package name to ↵Chad Brubaker2014-03-121-4/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requestRouteToHost" into klp-dev * commit '1011960c44a4f84d53d05199fe1ca09be9473822': Add the calling package name to requestRouteToHost
| | | | * | | | | | | | | | | | | | Merge "Add the calling package name to requestRouteToHost" into klp-devChad Brubaker2014-03-111-4/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | Add the calling package name to requestRouteToHostChad Brubaker2014-03-051-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The calling package name will be used to check if an application is a system application when deciding if a route should be exempt from VPN routing rules. Bug: 12937545 Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405
| | | * | | | | | | | | | | | | | | am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the ↵Christopher Tate2014-03-121-10/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transport disappears" into klp-dev * commit '87503f8561296fea489f8a3fe8384f61150976da': DO NOT MERGE - Don't hang installs if the transport disappears
| | | | * | | | | | | | | | | | | | DO NOT MERGE - Don't hang installs if the transport disappearsChristopher Tate2014-03-101-10/+19
| | | | | |_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 12991308 Cherry-pick from master. Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
| | | * | | | | | | | | | | | | | am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."Dave Allison2014-03-112-4/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b94904ab6dfbb9db7e8042f10886042a295857d4': ART profiler usage.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."Narayan Kamath2014-03-112-17/+71
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77': Inform libcore of time format pref. changes.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in ↵Craig Mautner2014-03-111-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created Task" * commit '7a93aa2fc2555b0de41bb5f30eb0e9cce2413084': Avoid duplication of AppWindowToken in created Task
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock ↵Christopher Tate2014-03-111-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application to system application" * commit '41bfe121cfa889df803a8916000e1fd0fbe87d5a': Fixed upgrading from forward-lock application to system application
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code ↵Robert Greenwalt2014-03-101-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Info" into klp-dev * commit 'e8af5e10e04697acb26b47e5d60b99e5c61a020c': DO NOT MERGE Debounce wifi country code Info
| | | | * | | | | | | | | | | | | | | | | Merge "DO NOT MERGE Debounce wifi country code Info" into klp-devRobert Greenwalt2014-03-101-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | DO NOT MERGE Debounce wifi country code InfoRobert Greenwalt2014-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're getting signals from the radio and it sometimes drops out for a while. This change will delay applying an empty country code for 15sec but apply non-empty country codes immediately. It uses a sequence number so we only apply the most recent change, even if it's delayed. Also secures the wifi call to set the country code as we can't allow apps to set it willy-nilly. bug:11062898 Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a
| | | * | | | | | | | | | | | | | | | | | | am 9e413bf4: am bbfc08b3: Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-03-101-2/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e413bf4e562d98b6efeb157369f152edd5f0261': open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal Move time setting code from SystemClock to AlarmManagerService
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot ↵Vinit Deshapnde2014-03-101-1/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interaction for Wifi" into klp-dev * commit '5f683ca80611c3e98c91f631ee05dccf3e7e0227': DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
| | | | * | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into ↵Vinit Deshapnde2014-03-101-1/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev
| | | | | * | | | | | | | | | | | | | | | | | DO NOT MERGE - Fix Airplane Mode + reboot interaction for WifiVinit Deshapnde2014-03-051-1/+11
| | | | | | |_|_|_|_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes two problems - first, if you rebooted phone after turning on Airplane mode, Wifi controller goes to ScanOnly mode which may end up in Wifi radio transmissions. Secondly, because of this incorrect state, the state machine doesn't turn on Wifi once Airplane mode is turned off. bug: 11409692 Change-Id: I55b4a5352a72a9c783e1b9891dd5363434585fb0
| | | * | | | | | | | | | | | | | | | | | | am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit ↵Narayan Kamath2014-03-071-15/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible" * commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf': AArch64: Make AssetAtlasService 64-bit compatible
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed ↵Craig Mautner2014-03-071-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." * commit '23ef1b5e0b84e3bb726454b97846f91f2efad212': A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when ↵Jeff Sharkey2014-03-071-2/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabling NAT" * commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7': Tethering: Skip link local addresses when enabling NAT
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one ↵Jeff Sharkey2014-03-071-14/+35
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onShutDownComplete" * commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894': Fix, MountService now only sends one onShutDownComplete