ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,442 Commits 2 Branches 0 Tags 54 MiB
ba7718b979
Commit Graph

14442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
7e653fb246 Merge "Missed a case to resumeUpdatePicture." into froyo 2010-04-16 16:34:43 -07:00
Scott Main
65db994ad3 am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo 
Merge commit '0df87c0653fc9e8425643a10cd71594a962fab8d' into froyo-plus-aosp

* commit '0df87c0653fc9e8425643a10cd71594a962fab8d':
  cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54
 2010-04-16 16:17:55 -07:00
Scott Main
f3401a3e85 Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo 2010-04-16 16:14:33 -07:00
The Android Open Source Project
4a7c89014b merge from open-source master 
Change-Id: I050a2b6f3d09f079a50491aeabb86b242a59d647
 2010-04-16 15:18:28 -07:00
Vasu Nori
10d5bfb0f3 am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo 
Merge commit '1fc46c623f9af8aaccfd519ece78331d9a95e579' into froyo-plus-aosp

* commit '1fc46c623f9af8aaccfd519ece78331d9a95e579':
  accept close() on database objects even if the database is closed
 2010-04-16 14:53:32 -07:00
Vasu Nori
61e1476f59 Merge "accept close() on database objects even if the database is closed" into froyo 2010-04-16 14:48:47 -07:00
Carl Shapiro
a0cf170b63 am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo 
Merge commit 'd5a873fbe8df67e86990969b6729db0079bbc278' into froyo-plus-aosp

* commit 'd5a873fbe8df67e86990969b6729db0079bbc278':
  Add command line flags to enable lock profiling.
 2010-04-16 13:28:23 -07:00
Carl Shapiro
46b99505a2 Merge "Add command line flags to enable lock profiling." into froyo 2010-04-16 13:25:03 -07:00
The Android Open Source Project
3d95a00b2c merge from open-source master 
Change-Id: I93512089253f00b3da1e31f8b5f4d6e72fae8dc4
 2010-04-16 12:46:21 -07:00
Mike Reed
1fdcb1723b am f066611a: retool resize logic to use max dimension and max area. 
Merge commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a' into froyo-plus-aosp

* commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a':
  retool resize logic to use max dimension and max area.
 2010-04-16 12:24:09 -07:00
Mike LeBeau
4b54ad047a am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo 
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp

* commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
  For search suggestions in the search dialog, allow the 'title'
 2010-04-16 07:27:34 -07:00
Mike LeBeau
5ed86e4c8a Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo 2010-04-16 07:23:12 -07:00
Robert Greenwalt
600f5d2492 am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo 
Merge commit 'e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp

* commit 'e80c6f49d5055e299b7ada91b5967feab66e467b':
  Add multi-sim support to ThrottleService.
 2010-04-15 17:42:24 -07:00
Robert Greenwalt
c3a26bfeb0 Merge "Add multi-sim support to ThrottleService." into froyo 2010-04-15 17:37:55 -07:00
Dianne Hackborn
e1475461d2 am e3094117: Merge "A little more improvement of the Service javadoc." into froyo 
Merge commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp

* commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
  A little more improvement of the Service javadoc.
 2010-04-15 13:36:44 -07:00
Dianne Hackborn
e0cae12b5b Merge "A little more improvement of the Service javadoc." into froyo 2010-04-15 13:33:21 -07:00
Robert Greenwalt
6eb61296bc am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo 
Merge commit 'bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp

* commit 'bf943f296864d9647268fb5a55805ebf1fcba173':
  Fix SntpClient to give accurate time info.
 2010-04-15 13:33:03 -07:00
Robert Greenwalt
d3fd93b8e0 Merge "Fix SntpClient to give accurate time info." into froyo 2010-04-15 13:28:43 -07:00
David 'Digit' Turner
9c66aa09e7 am 4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA. 
Merge commit '4f99e3c28449833b10ee23c538246847fdb6a498' into froyo-plus-aosp

* commit '4f99e3c28449833b10ee23c538246847fdb6a498':
  Remove native binaries when an updated system application is upgraded through OTA.
 2010-04-15 12:19:23 -07:00
Kenny Root
05a192dbe2 am fa22de79: Merge "Import revised translations" into froyo 
Merge commit 'fa22de7993f94d338330a888bdc2aeaaf857c719' into froyo-plus-aosp

* commit 'fa22de7993f94d338330a888bdc2aeaaf857c719':
  Import revised translations
 2010-04-15 06:00:18 -07:00
Kenny Root
bb87a93aff Merge "Import revised translations" into froyo 2010-04-15 05:55:00 -07:00
Mike Lockwood
7d34b4dcb9 am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 
Merge commit '93597ed1839de164c81f83832d4c2373ea32ac8f' into froyo-plus-aosp

* commit '93597ed1839de164c81f83832d4c2373ea32ac8f':
  Fix wakelock leak in PowerManagerService.sendNotificationLocked()
 2010-04-15 05:48:26 -07:00
Mike Lockwood
c1f32b0390 Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 2010-04-15 05:45:21 -07:00
Dianne Hackborn
7230aea611 am 90d3f458: API 8! 
Merge commit '90d3f458d99d9c0f35f9ee295997661c2493cb58' into froyo-plus-aosp

* commit '90d3f458d99d9c0f35f9ee295997661c2493cb58':
  API 8!
 2010-04-14 22:27:10 -07:00
Robert Greenwalt
1db843f251 am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 
Merge commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp

* commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729':
  Sholes mobile iface comes/goes - handle the reset
 2010-04-14 20:25:51 -07:00
Suchi Amalapurapu
eaf56ded1b am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well. 
Merge commit 'deb69370ef9a786940ae49411ba657410361b4f1' into froyo-plus-aosp

* commit 'deb69370ef9a786940ae49411ba657410361b4f1':
  Revert "Add ordered broadcast when removing packages."
 2010-04-14 20:25:48 -07:00
Robert Greenwalt
8ae5bf5e2c Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 2010-04-14 20:23:45 -07:00
Dianne Hackborn
f335f42131 am b0ef1442: Merge "Fix issue #258640: Automatic propagation of 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
 2010-04-14 19:05:11 -07:00
Dianne Hackborn
62636a7ae5 Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo 2010-04-14 19:02:00 -07:00
Dmitri Plotnikov
8b3cb0d4cc am 5304d8fd: Merge "Introducing "strict project map"." into froyo 
Merge commit '5304d8fdc9064f2831ef16db9242f17110287997' into froyo-plus-aosp

* commit '5304d8fdc9064f2831ef16db9242f17110287997':
  Introducing "strict project map".
 2010-04-14 18:36:36 -07:00
Dmitri Plotnikov
d3f849b4e1 Merge "Introducing "strict project map"." into froyo 2010-04-14 18:33:54 -07:00
Suchi Amalapurapu
fb2724fe56 am 28b2fdc5: Merge "Dont fall back to installing on sdcard when internal 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
 2010-04-14 18:31:37 -07:00
Suchi Amalapurapu
a8b0ff4840 Merge "Dont fall back to installing on sdcard when internal 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 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 2010-04-14 18:28:22 -07:00
Mathias Agopian
ee2d0608c8 am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes 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)
 2010-04-14 18:22:33 -07:00
Mathias Agopian
90e479389b Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo 2010-04-14 18:18:44 -07:00
Suchi Amalapurapu
b955d51032 am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyo 
Merge commit '40b6996a8fb7da131e8b91453b08e292723662be' into froyo-plus-aosp

* commit '40b6996a8fb7da131e8b91453b08e292723662be':
  Add ordered broadcast when removing packages.
 2010-04-14 18:15:31 -07:00
Suchi Amalapurapu
d58d8f6453 Merge "Add ordered broadcast when removing packages." into froyo 2010-04-14 18:11:34 -07:00
Mathias Agopian
ca99fb8f65 fix [2594950] Flash: Zooming in on some content crashes the Nexus One and 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
 2010-04-14 16:43:44 -07:00
Vasu Nori
773dbcc0a0 am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo 
Merge commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63' into froyo-plus-aosp

* commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63':
  verify database state before calling sqlite. Bug:2593970
 2010-04-14 16:27:04 -07:00
Grace Kloba
58ab590bc5 am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo 
Merge commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7' into froyo-plus-aosp

* commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7':
  Pass WebKit scrollbar mode to Java. When scrollbar
 2010-04-14 16:26:55 -07:00
Vasu Nori
661bc51cbb Merge "verify database state before calling sqlite. Bug:2593970" into froyo 2010-04-14 15:53:43 -07:00
Grace Kloba
218aa6b818 Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don't trigger scroll." into froyo 2010-04-14 12:44:05 -07:00
Eric Laurent
4024e20f13 am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when 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.
 2010-04-14 12:09:52 -07:00
Eric Laurent
0536e3255c am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 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.
 2010-04-14 12:04:16 -07:00
Andrei Popescu
8dd91d14ac am 01e3feaf: Merge "Make sure the onended event is dispatched even when the 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
 2010-04-14 12:04:13 -07:00
Dianne Hackborn
21989a73b7 am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 
Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp

* commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee':
  Fix issue #593153: Broadcast time out when sending...
 2010-04-14 12:04:07 -07:00
James Dong
d198c9d51a am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 
Merge commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50' into froyo-plus-aosp

* commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50':
  Use PV_PLAYER to handle RTSP streaming
 2010-04-14 12:03:53 -07:00
Robert Greenwalt
dfea74ea10 am 22b3644a: Update the datause icons. 
Merge commit '22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp

* commit '22b3644ac2027d055a6b187c979ef492ee6fb082':
  Update the datause icons.
 2010-04-14 12:03:33 -07:00
Robert Greenwalt
d241170ec8 am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo 
Merge commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp

* commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9':
  Perist Throttle data across reboots
 2010-04-14 12:03:22 -07:00
Leon Scroggins
0b450acc58 am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 
Merge commit 'b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp

* commit 'b2212464a3bc4103a9e5e88602d1097c835d7949':
  Ensure the selection does not change in setTextAndKeepSelection.
 2010-04-14 12:02:53 -07:00