summaryrefslogtreecommitdiffstats
path: root/services/java/com
Commit message (Collapse)AuthorAgeFilesLines
* Clean up status bar, system bar, navigation bar management.Dianne Hackborn2012-04-042-11/+20
| | | | | | | | | | | | | | | | | | | | | | The status bar and navigation bar are two completely separate elements, with their own semantics. The system bar now classifies itself as a navigation bar, since that is really how it behaves. This required rewriting the HDMI resizing code, so that it is all done by PhoneWindowManager since that is what is responsible for the size of the navigation bar (and thus now system bar). This actually gets rid of a fair amount of code, and means we can also do the same thing for a pure navigation bar. Likewise the system bar now has the navigation bar ability to be hidden when requested by system UI flags. To get the behavior we want on Xoom, we only allow the nav bar to be hidden when it will help provide a better aspect ratio for showing widescreen videos. Finally the nav/system bar now animates when hidden and shown. Change-Id: Ie927154b68376a0b61802f99171ff56b8da92e7a
* Merge "Add initial framework for DNS service discovery"Irfan Sheriff2012-04-042-0/+279
|\
| * Add initial framework for DNS service discoveryIrfan Sheriff2012-04-042-0/+279
| | | | | | | | Change-Id: I53c0b7ebfd75e520ebb7553612f1aa8413b6b79b
* | Merge "First separation of animation from AppWindowToken."Craig Mautner2012-04-046-369/+414
|\ \
| * | First separation of animation from AppWindowToken.Craig Mautner2012-04-046-369/+414
| | | | | | | | | | | | | | | | | | New class AppWindowAnimator pulls animation out of AppWindowToken. Change-Id: Ic1ccb6ec2bf091f1f901fe3c20cbeb242376ae6b
* | | Merge "Move more items between layout and animate sides."Craig Mautner2012-04-046-97/+227
|\ \ \ | |/ / | | / | |/ |/|
| * Move more items between layout and animate sides.Craig Mautner2012-04-046-97/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Isolate DimAnimator animation from the layout side. - Isolate mWallpaperForceHidingChanged and mOrientationChangeComplete from the animation side. - Eliminate a redundant setting of mOrientationChangeComplete to true. It was already true at that point. - Synchronize changes to mWindows and mAppTokens on mAnimator. This is a nop until we go to multiple threads. - Synchronize AppWindowToken.freezingScreen on mAnimator. - Modification to repeat layout debugging including temporary enabling of spew on layout repeats. Change-Id: Ic8d82b1c197144aaf6957caa5f71e175288220f2
* | Merge commit 'bc52ca2'Mike Lockwood2012-04-031-4/+9
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: services/java/com/android/server/am/ActivityManagerService.java Change-Id: I6da33a191a4ac13d08d8350a432b205e3dff85da
| * | Stop ANR dialogs from appearing when ActivityManager dialogs should not be shownJustin Koh2012-03-291-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop ANR dialogs from appearing on devices where the ActivityManager dialogs should not be shown. Instead, kill the process. This is preferable because the user can't actually do anything on the device. TESTED = runs on device with that config, simulated ANR using test app. Change-Id: I6267000afd12ef929f0c625220184c6ab0139552
| * | Make immersive mode public & imply update lockingChristopher Tate2012-03-191-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activity.setImmersive(boolean) / android:immersive="bool" are now public. In addition, if the foreground activity is immersive then an update lock will be held on its behalf. This lets applications such as movie players suppress the display of intrusive notifications, OTA-availability dialogs, and the like while they are displaying content that ought not to be rudely interrupted. The update lock aspect of this mode is *advisory*, not binding -- the update mechanism is not actually constrained; it simply uses this information in deciding whether/when to prompt the user. It's more a guideline than a rule. Bug 6154438 Change-Id: Ibd3491fc437077f3fa0d9708ed91955121e8c877
| * | am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" ↵Dianne Hackborn2012-03-163-12/+151
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'ce06c000b4133c63414c3244c3325e25315ab179': Debugging code for #6169553: Make Phone launch faster
| * \ \ am 0e873700: Remove the country detector loggingDaniel Lehmann2012-03-122-2/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '0e87370077b322b3a88c345a44c6bf3d56617071': Remove the country detector logging
| * | | | fix setting only usb modeRoboErik2012-03-071-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you cleared the last usb mode it would fail (and so would setting it if you started with none). This fixes it to set and unset the last property correctly. Change-Id: I8aa62a65ccda5f3872d2995f30d80426f07a281c
| * | | | Merge "Do not assume that there is always a running activity (Necessary for ↵Kevin Hester-Chow2012-03-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | headless devices)" into ics-aah
| | * | | | Do not assume that there is always a running activityKevin Hester-Chow2012-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Necessary for headless devices) Change-Id: I61969ebfdd4aa02a3661272a0bcd0aa67667f115
| * | | | | Detect (at runtime) kernel support for the "hdmi_audio" switch.John Grossman2012-03-061-43/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new switch was introduced in AndroidAtHome to deal with a race condition between the WiredAccessoryObserver and the HW composer HAL. When the new switch ("hdmi_audio") is present, we want to pay attention to it instead of paying attention to the old switch ("hdmi"). This change checks at startup for the presence or absence of the new switch and uses it if available, otherwise it falls back on classic behavior. see change ID I960cfc2f3e8df5342e7248a26fd313fdad2ca322 for the kernel side changes. see bug 6023647 for a discussion of the issue. Change-Id: Ia2f2c399c3d85896ede0fff57ecbd51f332b3e0e Signed-off-by: John Grossman <johngro@google.com>
| * | | | | Send UpdateLock broadcasts to manifest receiversChristopher Tate2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that e.g. the system update service doesn't need to run all the time. Bug 5543442 Change-Id: Icd0fcc7f771f7ba92ff190ffed0f0debba4bd911
| * | | | | Merge "Introduce UpdateLocks - "now is not a good time for non-interactive ↵Christopher Tate2012-02-292-0/+133
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | OTA"" into ics-aah
| | * | | | | Introduce UpdateLocks - "now is not a good time for non-interactive OTA"Christopher Tate2012-02-282-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An "UpdateLock" works similarly to a wake lock in API: the caller is providing a hint to the OS that now is not a good time to interrupt the user/device in order to do intrusive work like applying OTAs. This is particularly important for headless or kiosk-like products where ordinarily the update process will be automatically scheduled and proceed without user or administrator intervention. UpdateLocks require that the caller hold the new signatureOrSystem permission android.permission.UPDATE_LOCK. acquire() and release() will throw security exceptions if this is not the case. The "is now convenient?" state is expressed to interested parties by way of a sticky broadcast sent only to registered listeners. The broadcast is protected; only the system can send it, so listeners can trust it to be accurate. The broadcast intent also includes a timestamp (System.currentTimeMillis()) to help inform listeners that wish to implement scheduling policies based on when the device became idle. The API change here is a tiny one: a dump(PrintWriter) method has been added to the TokenWatcher class to facilitate getting information out of it for dumpsys purposes. UpdateLock itself is still @hide. Bug 5543442 Change-Id: Ic1548dd43935f45d4efc67f970abdc290a45f715
| * | | | | | am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting ↵Dianne Hackborn2012-02-282-33/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called..." into ics-mr1 * commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b': Fix issue #6073913: onActivityResult() not getting called...
| * \ \ \ \ \ \ am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" ↵Dianne Hackborn2012-02-241-33/+78
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '133dc2d7aecc68990c363c861716b134910a4ced': Fix issue #6048808: sometimes auto-correct is inactive
| * | | | | | | am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgradedDianne Hackborn2012-02-212-2/+8
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '01011c3d7ce4f76c1a76b33a04fc63da784ddbea': Fix issue #6037252: Screen shifts after all apps are upgraded
| * | | | | | | am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ↵Robert Greenwalt2012-02-141-11/+25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd': Stop using shared DUN APN when tethering stops.
| * \ \ \ \ \ \ \ am ffc89899: Merge "Don\'t pulse LED on new notification unless notification ↵Mike Lockwood2012-02-141-1/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has LED flag set" into ics-mr1 * commit 'ffc89899652f5c815b6d156f55a909001420891e': Don't pulse LED on new notification unless notification has LED flag set
| * \ \ \ \ \ \ \ \ am 197fe269: Merge "Add OEM specific USB mode enumeration based on ↵Wink Saville2012-02-101-1/+69
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ro.bootmode property" into ics-mr1 * commit '197fe26940022be75384f4038dd789f446d33122': Add OEM specific USB mode enumeration based on ro.bootmode property
| * | | | | | | | | | Add the CommonTimeManagementService.John Grossman2012-02-062-0/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a small service to the high level core set of system services to control the configuration of the native common time service. This service is responsible for controlling policy regarding when the common time service should be allowed to run, which networks it is allowed to run on, what priority it runs at in the master election algorithm, and so on. Change-Id: I37308e882a0e8c4cd3e38c4f47b7c40b9150ba31
| * | | | | | | | | | am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1Robert Greenwalt2012-01-251-2/+14
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2': Filter our v6 address from tethering dns.
| * \ \ \ \ \ \ \ \ \ \ am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1Robert Greenwalt2012-01-241-6/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f449ea9e96162698f4ec6d62c70750eb50744da7': Use the carrier-given dns addrs for tethering.
| * \ \ \ \ \ \ \ \ \ \ \ am 47163685: Merge "Another attempt at issue #5823276: home repaints after ↵Dianne Hackborn2012-01-242-7/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full-screen app is exited" into ics-mr1 * commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b': Another attempt at issue #5823276: home repaints after full-screen app is exited
| * \ \ \ \ \ \ \ \ \ \ \ \ am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread ↵Jim Miller2012-01-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | priority"" into ics-mr1 * commit '44760b106a4bafcf83fb356bf91683db40e0e5a2': Revert "Fix 5797764: Increase lock screen's thread priority"
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" ↵Jim Miller2012-01-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'eaa11a723150f1ea79446d7ba4bf77eb47b73337': Fix 5797764: Increase lock screen's thread priority
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1bae8066: Merge "Fix issue #5823276 again: home repaints after ↵Dianne Hackborn2012-01-202-14/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full-screen app is exited" into ics-mr1 * commit '1bae80668cc1d12bb4a4b93bce1960b2601de131': Fix issue #5823276 again: home repaints after full-screen app is exited
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints ↵Justin Ho2012-01-192-28/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after full-screen app is exited"" into ics-mr1 * commit '820b45c0a21980a43532b9fb9823f8aa08c64a15': DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." ↵Jim Miller2012-01-182-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '230a709285abc5dfd92f05d91a8997d52a59d3c7': Fix 5863053: Add method to lock screen immediately.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app ↵Dianne Hackborn2012-01-132-14/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is exited" into ics-mr1 * commit '2e282f35b009fe4c23daca35592dae2032641643': Fix issue #5823276: home repaints after full-screen app is exited
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2cf18d28: Merge "Streamline package-installed handling by the Backup ↵Christopher Tate2012-01-131-57/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manager" into ics-mr1 * commit '2cf18d28785fdd188641867503586627cb212302': Streamline package-installed handling by the Backup Manager
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1Chia-chi Yeh2012-01-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff321d496a6a07fc667112ecfe4d9a107d44147b': VPN: silence VPN notifications.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1Robert Greenwalt2012-01-121-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7': Disable wimax when mobile data is in Settings
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ↵Danielle Millett2012-01-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '2931d8ace9118bafe08090cd41e235048b6c2eb2': DO NOT MERGE - Cherry picking from master to MR1
| * | | | | | | | | | | | | | | | | | | | | | | Show the flags in package manager debugging.Joe Onorato2012-01-041-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f603f52c7199f1fbe377df0794a85450260e974
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add a new ui mode for "appliance"" into ics-aahJoe Onorato2011-12-161-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | Add a new ui mode for "appliance"Joe Onorato2011-12-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is that this is a device which is more-or-less headless. It might have some limited interaction capabilities, but it's not something that you want to rely on having. Change-Id: Icc9f674299f8dbe2b736a5622a4965904d27e49c
| * | | | | | | | | | | | | | | | | | | | | | | | am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1Justin Ho2011-12-162-35/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d': Cherry-picking Id45abeba and Ia065dec6 for MR1
| * | | | | | | | | | | | | | | | | | | | | | | | am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu ↵Dianne Hackborn2011-12-131-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is open" into ics-mr1 * commit '19a06fe93cccb4b1dd224b8456969821a19b07ef': Fix issue #5755172: Soft menu key disappears when menu is open
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1Jeff Sharkey2011-12-131-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0bbc494d638f4c77e688bf9410027f453301559': Avoid NPE when missing network stats.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN ↵Chia-chi Yeh2011-12-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daemons." into ics-mr1 * commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487': VPN: delete the "abort" file before starting VPN daemons.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1Irfan Sheriff2011-12-081-18/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97ff7893321362020211fae3c5a52b95c3ec19e1': Fix wifi bring up at boot up
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1Irfan Sheriff2011-12-081-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '583fdf0068ac46fb384a5aa2b193faf743f8221c': Handle emergency call back mode correctly
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 87e06ec2: Merge "Fix issue #5144065: Tap on Music icon from Home ↵Dianne Hackborn2011-12-071-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen..." into ics-mr1 * commit '87e06ec2fa57a54b92fe82f2cacfbf8a44e47baf': Fix issue #5144065: Tap on Music icon from Home screen...
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add an option that disables the AUDIO_BECOMING_NOISY intent send when ↵Jason Simmons2011-12-071-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a headset is hotplugged." into ics-aah