summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into ↵Robert Greenwalt2010-04-141-0/+12
|\ | | | | | | | | | | | | | | | | froyo Merge commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp * commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729': Sholes mobile iface comes/goes - handle the reset
| * Merge "Sholes mobile iface comes/goes - handle the reset" into froyoRobert Greenwalt2010-04-141-0/+12
| |\
| | * Sholes mobile iface comes/goes - handle the resetRobert Greenwalt2010-04-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The byte counter for the iface goes to zero when it comes back. Catch that and do the complex math to correct. Also add a log entry telling us our desired throttle index. Lastly, reset the sec/msec part of our reset time so that one calc will == another and not be off by little bits. bug:25494925 Change-Id: I99525b72a76316a8e601ceb457ca202fae040bae
* | | am deb69370: Revert "Add ordered broadcast when removing packages." Couple ↵Suchi Amalapurapu2010-04-141-29/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | of cosmetic fixes as well. Merge commit 'deb69370ef9a786940ae49411ba657410361b4f1' into froyo-plus-aosp * commit 'deb69370ef9a786940ae49411ba657410361b4f1': Revert "Add ordered broadcast when removing packages."
| * | Revert "Add ordered broadcast when removing packages."Suchi Amalapurapu2010-04-141-29/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Couple of cosmetic fixes as well. This reverts commit 0c1285fa979e8b8c170f31d0ef1b4e5d9ddcf6b1. Conflicts: services/java/com/android/server/PackageManagerService.java Change-Id: Ife0f9f80525f4a41b1f8c12ffc2de62e061e7d5b
* | | am b0ef1442: Merge "Fix issue #258640: Automatic propagation of ↵Dianne Hackborn2010-04-141-2/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo Merge commit 'b0ef1442866ec52a772e6edfab732a2c987bbee0' into froyo-plus-aosp * commit 'b0ef1442866ec52a772e6edfab732a2c987bbee0': Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
| * | Merge "Fix issue #258640: Automatic propagation of ↵Dianne Hackborn2010-04-141-2/+11
| |\ \ | | | | | | | | | | | | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
| | * | Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESETDianne Hackborn2010-04-141-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure, if an activity is started with clear task when reset, if that activity is finished in the middle of a stack that the behavior is retained by propagating it to the next activity. Change-Id: Ie31b8f968558b0e64e0ef7efa55950a722c6afa5
* | | | am 5304d8fd: Merge "Introducing "strict project map"." into froyoDmitri Plotnikov2010-04-141-2/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '5304d8fdc9064f2831ef16db9242f17110287997' into froyo-plus-aosp * commit '5304d8fdc9064f2831ef16db9242f17110287997': Introducing "strict project map".
| * | | Merge "Introducing "strict project map"." into froyoDmitri Plotnikov2010-04-141-2/+10
| |\ \ \
| | * | | Introducing "strict project map".Dmitri Plotnikov2010-04-141-2/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I147e10ac6475badf1d21e2c27d1cedbb27bd49df
* | | | | am 28b2fdc5: Merge "Dont fall back to installing on sdcard when internal ↵Suchi Amalapurapu2010-04-143-108/+99
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard i Merge commit '28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c' into froyo-plus-aosp * commit '28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c': Dont fall back to installing on sdcard when internal storage is filled up
| * | | | Merge "Dont fall back to installing on sdcard when internal storage is ↵Suchi Amalapurapu2010-04-143-108/+99
| |\ \ \ \ | | | | | | | | | | | | | | | | | | filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard is filled up. If nothing is specified ie install location is set to let system decide, we just check on internal storage. Fix tests" into froyo
| | * | | | Dont fall back to installing on sdcard when internal storage is filled upSuchi Amalapurapu2010-04-143-108/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard is filled up. If nothing is specified ie install location is set to let system decide, we just check on internal storage. Fix tests Change-Id: I7400ccc131782d9c45284bd9ebd0dee43a3b412b
* | | | | | am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes ↵Mathias Agopian2010-04-143-2/+27
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Nexus One and causes it to reboot (runtime restart)" into froyo Merge commit '454234657cd9b0835ecd9c6704cbcd5369e926b1' into froyo-plus-aosp * commit '454234657cd9b0835ecd9c6704cbcd5369e926b1': fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
| * | | | | Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One ↵Mathias Agopian2010-04-143-2/+27
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | and causes it to reboot (runtime restart)" into froyo
| | * | | | fix [2594950] Flash: Zooming in on some content crashes the Nexus One and ↵Mathias Agopian2010-04-143-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causes it to reboot (runtime restart) We now limit the size of the surface to the maximum size supported by the GPU. On Nexus One this will 2048 -- it could be different on other devices. Surface creation fails if the limit is exceeded. Change-Id: I9ecfc2e9c58c9e283782b61ebfc6b590f71df785
* | | | | | am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyoSuchi Amalapurapu2010-04-141-28/+31
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '40b6996a8fb7da131e8b91453b08e292723662be' into froyo-plus-aosp * commit '40b6996a8fb7da131e8b91453b08e292723662be': Add ordered broadcast when removing packages.
| * | | | | Merge "Add ordered broadcast when removing packages." into froyoSuchi Amalapurapu2010-04-141-28/+31
| |\ \ \ \ \
| | * | | | | Add ordered broadcast when removing packages.Suchi Amalapurapu2010-04-141-28/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30a84068fa8f2b15564b0a164d339ac95f40e801
* | | | | | | am 0bbcdc6c: Merge "verify database state before calling sqlite. ↵Vasu Nori2010-04-144-26/+61
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:2593970" into froyo Merge commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63' into froyo-plus-aosp * commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63': verify database state before calling sqlite. Bug:2593970
| * | | | | | Merge "verify database state before calling sqlite. Bug:2593970" into froyoVasu Nori2010-04-144-26/+61
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | verify database state before calling sqlite. Bug:2593970Vasu Nori2010-04-134-26/+61
| | | |/ / / | | |/| | | | | | | | | | | | | | | Change-Id: Id68365abccbdca572ad13c2b51162d53993ff540
* | | | | | am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is ↵Grace Kloba2010-04-142-4/+33
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alwaysOff, don\'t trigger scroll." into froyo Merge commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7' into froyo-plus-aosp * commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7': Pass WebKit scrollbar mode to Java. When scrollbar
| * | | | | Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, ↵Grace Kloba2010-04-142-4/+33
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | don't trigger scroll." into froyo
| | * | | | | Pass WebKit scrollbar mode to Java. When scrollbarGrace Kloba2010-04-132-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is alwaysOff, don't trigger scroll. If there is no horizontal and vertical scrollbar, don't trigger the zoom control neither. Fix http://b/issue?id=2512549
* | | | | | | am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when ↵Eric Laurent2010-04-141-17/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving a call in silent mode. Merge commit '758dd527f64f1e827adfe09f0141ab213733ca22' into froyo-plus-aosp * commit '758dd527f64f1e827adfe09f0141ab213733ca22': Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
| * | | | | | Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in ↵Eric Laurent2010-04-141-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | silent mode. This is a regression introduced by change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7 for issue 2472495. When AudioService changes audio mode, setMode() reapplies current volume for the default active stream which in this case is STREAM_RING. Because the new implementation of silent mode actually mutes the ringer stream, setStreamVolumeInt() now applies the volume change received while in silent mode to the last audible value and we end up clearing the last audible volume for ringer. The fix consists in not modifying last audible value when the new value is 0. Also removed obsolete code in setStreamVolumeInt() since new implementation of setRingerModeInt() in change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7. Change-Id: I746f3bc1af39a602ce12d130ce592007b2d0ebb6
* | | | | | | am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 ↵Eric Laurent2010-04-141-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outside of silent mode." into froyo Merge commit '745b43c28fd6bb82c72a15b28be75c55dd115171' into froyo-plus-aosp * commit '745b43c28fd6bb82c72a15b28be75c55dd115171': Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
| * | | | | | Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent ↵Eric Laurent2010-04-141-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mode." into froyo
| | * | | | | | Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.Eric Laurent2010-04-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem happens only if volume down key is pressed while already in silent or vibrate mode. In this case, AudioService accepts changing the last audible index for ringer volume from 1 to 0. When volume up is pressed, current ringer volume value is restored from 0 instead of 1. The fix consists in keeping last audible index at 1 once in silent of vibrate mode even is volume down key is pressed. Change-Id: Id08edd12ce985c22233124545eba2c3e4b8cdc8e
* | | | | | | | am 01e3feaf: Merge "Make sure the onended event is dispatched even when the ↵Andrei Popescu2010-04-141-5/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user dismisses the video before it plays to completion." into froyo Merge commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412' into froyo-plus-aosp * commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412': Make sure the onended event is dispatched even when
| * | | | | | | Merge "Make sure the onended event is dispatched even when the user ↵Andrei Popescu2010-04-141-5/+7
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | dismisses the video before it plays to completion." into froyo
| | * | | | | | Make sure the onended event is dispatched even whenAndrei Popescu2010-04-141-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the user dismisses the video before it plays to completion. Fix bug: 2533272 Change-Id: I73f216f4f416f5fdca0bbba2244b88666f8f6eac
* | | | | | | | am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." ↵Dianne Hackborn2010-04-145-98/+130
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp * commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee': Fix issue #593153: Broadcast time out when sending...
| * | | | | | | Merge "Fix issue #593153: Broadcast time out when sending..." into froyoDianne Hackborn2010-04-145-98/+130
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix issue #593153: Broadcast time out when sending...Dianne Hackborn2010-04-145-98/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...ordered broadcast for ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE Turns out this was because the broadcast receiver for ContextImpl was not correctly being created, so when it received an ordered broadcast it would not tell the activity manager when it was done. This is now fixed, along with a ton of superficial changes to debug output to help track this down and a little cleanup of dealing with error cases in dispatching broadcasts. Also a fix for a NPE when dumping the broadcast state. Finally, a little fiddling with package manager to get rid of a lot of the noise when removing and re-adding packages on the SD card. Change-Id: I961c14836dc613d3ea8122b6e910ef866e7fcb25
* | | | | | | | am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyoJames Dong2010-04-141-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50' into froyo-plus-aosp * commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50': Use PV_PLAYER to handle RTSP streaming
| * | | | | | | Merge "Use PV_PLAYER to handle RTSP streaming" into froyoJames Dong2010-04-141-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Use PV_PLAYER to handle RTSP streamingJames Dong2010-04-141-0/+5
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 2594865 Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
* | | | | | | am 22b3644a: Update the datause icons.Robert Greenwalt2010-04-145-5/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp * commit '22b3644ac2027d055a6b187c979ef492ee6fb082': Update the datause icons.
| * | | | | | Update the datause icons.Robert Greenwalt2010-04-145-5/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | bug:2576057 Change-Id: Idf57d59aecb9bcff635dafa1e77d90a8737a0c08
* | | | | | am 9cb66e89: Merge "Perist Throttle data across reboots" into froyoRobert Greenwalt2010-04-141-21/+67
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp * commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9': Perist Throttle data across reboots
| * | | | | Merge "Perist Throttle data across reboots" into froyoRobert Greenwalt2010-04-141-21/+67
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Perist Throttle data across rebootsRobert Greenwalt2010-04-131-21/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Never got SharedPreferences working for this system service. Didn't really need it anyway. Using a straight up file now. bug:2576057 Change-Id: Idad926e8242a85e22718c25f3f6c03e5749badac
* | | | | | am b2212464: Merge "Ensure the selection does not change in ↵Leon Scroggins2010-04-141-0/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setTextAndKeepSelection." into froyo Merge commit 'b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp * commit 'b2212464a3bc4103a9e5e88602d1097c835d7949': Ensure the selection does not change in setTextAndKeepSelection.
| * | | | | Merge "Ensure the selection does not change in setTextAndKeepSelection." ↵Leon Scroggins2010-04-141-0/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into froyo
| | * | | | | Ensure the selection does not change in setTextAndKeepSelection.Leon Scroggins2010-04-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2589778 Change-Id: I72752797003216fdd12cebffbdf4cd9ffbf523e1
* | | | | | | am d503a152: Merge "Fix for 2585858, load invalid urls." into froyoKristian Monsen2010-04-141-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e' into froyo-plus-aosp * commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e': Fix for 2585858, load invalid urls.
| * | | | | | Merge "Fix for 2585858, load invalid urls." into froyoKristian Monsen2010-04-141-2/+3
| |\ \ \ \ \ \
generated by cgit v1.1 at 2025-03-21 04:42:36 +0000