Commit Graph

22820 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
72de8eb42b resolved conflicts for merge of 7c08b70c to master
Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088
2010-10-10 19:02:41 -07:00
Jean-Baptiste Queru
63b6c291c7 am 65f23e71: Merge "Corrected visibility reporting error in WindowManager"
Merge commit '65f23e71bdf7d9ca8c4aa8ed126ac2bc9a2cbf43' into gingerbread-plus-aosp

* commit '65f23e71bdf7d9ca8c4aa8ed126ac2bc9a2cbf43':
  Corrected visibility reporting error in WindowManager
2010-10-10 18:51:47 -07:00
Jean-Baptiste Queru
88ebed8b50 am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp

* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
  Hold partial wakelock during shutdown to avoid entering sleep
2010-10-10 18:51:43 -07:00
Gilles Debunne
5922b6238b resolved conflicts for merge of d7d47941 to master
Change-Id: I4ec47b9461c5ba350adfc257bc1820ee079b751e
2010-10-10 18:45:23 -07:00
Jean-Baptiste Queru
ed5753bb13 Merge "Corrected visibility reporting error in WindowManager" 2010-10-10 18:44:00 -07:00
Jean-Baptiste Queru
5945587a0d Merge "Hold partial wakelock during shutdown to avoid entering sleep" 2010-10-10 18:41:58 -07:00
Jean-Baptiste Queru
6c51446d17 am 0e430ccc: Merge "Telephony: Fix radio state printing"
Merge commit '0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp

* commit '0e430ccc2c8a4bb9d96002676d7742652bd28477':
  Telephony: Fix radio state printing
2010-10-10 18:37:41 -07:00
Jean-Baptiste Queru
7599186c83 am fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot"
Merge commit 'fb1e5529724d121aa47485e7245b69965088fbb4' into gingerbread-plus-aosp

* commit 'fb1e5529724d121aa47485e7245b69965088fbb4':
  Fix time zone info in kernel is nothing after reboot
2010-10-10 18:37:37 -07:00
Jean-Baptiste Queru
a816bd18fc Merge "Telephony: Fix radio state printing" 2010-10-10 18:32:39 -07:00
Jean-Baptiste Queru
b142a1c706 am 334a4d84: Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Merge commit '334a4d84df457f0b2b6f89a6930c9ec05a637e5a' into gingerbread-plus-aosp

* commit '334a4d84df457f0b2b6f89a6930c9ec05a637e5a':
  Telephony: Remove unused mRuimFileHandler reference from CDMAPhone
2010-10-10 18:24:01 -07:00
Jean-Baptiste Queru
dba39be3cb Merge "Fix time zone info in kernel is nothing after reboot" 2010-10-10 18:20:55 -07:00
Jean-Baptiste Queru
e03613e669 Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone" 2010-10-10 18:15:17 -07:00
Gilles Debunne
d3c1f0cf29 am 6b8bdaa9: New AppsPermission and market style
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp

* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
  New AppsPermission and market style
2010-10-10 18:08:25 -07:00
Jason Sams
1e8a65536d Merge "Cleanup error message for null binding address. Only print the debug if script debugging is enabled." 2010-10-10 18:04:11 -07:00
Dianne Hackborn
3198519dad am d5423321: am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread
Merge commit 'd5423321b920be10c00fbcbc5a702f15e00693a5'

* commit 'd5423321b920be10c00fbcbc5a702f15e00693a5':
  Fix issue #3074745: Crash in system process
2010-10-10 17:47:01 -07:00
Jean-Baptiste Queru
d2e18da5c3 am 965d5337: am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"
Merge commit '965d533733f0c5cd9c02813e32737b0b0ce552d0'

* commit '965d533733f0c5cd9c02813e32737b0b0ce552d0':
  NullPointerException at handleMessage(GSMPhone.java)
2010-10-10 17:46:37 -07:00
Brad Fitzpatrick
b591c83ed0 am b323559b: am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
Merge commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc'

* commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc':
  DropBoxManager.Entry implements Closeable
2010-10-10 17:46:10 -07:00
Andreas Huber
587ed4db05 am e0c8545a: am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread
Merge commit 'e0c8545a2369881fe09582337a9de3db2db1a951'

* commit 'e0c8545a2369881fe09582337a9de3db2db1a951':
  Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
2010-10-10 17:45:58 -07:00
Jean-Baptiste Queru
ef3270ad69 resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
2010-10-10 17:45:45 -07:00
Jeff Brown
01c3fd8116 am b13998f2: am d00b4386: Merge "Clarify some comments on individual key codes." into gingerbread
Merge commit 'b13998f2b482ff0ebe96cd683801758a01d10799'

* commit 'b13998f2b482ff0ebe96cd683801758a01d10799':
  Clarify some comments on individual key codes.
2010-10-10 17:45:25 -07:00
Mindy Pereira
89f6b437f9 am ab70a98b: (-s ours) am 612d570a: DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Merge commit 'ab70a98b0ec450379fa953a9fe911109329b9c37'

* commit 'ab70a98b0ec450379fa953a9fe911109329b9c37':
  DO NOT MERGE Adjust amount pull effects the glow and edge decay.
2010-10-10 17:45:13 -07:00
Jean-Baptiste Queru
2d97f3e590 Merge "Support showing "Cold" battery health." 2010-10-10 17:22:11 -07:00
Mike Lockwood
f8509d7962 am 98e1f384: am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
Merge commit '98e1f3840f06d3dfea987154da25d5351460d080'

* commit '98e1f3840f06d3dfea987154da25d5351460d080':
  Remove races in Geocoder/LocationProvider Proxy
2010-10-10 17:15:06 -07:00
Andreas Huber
7ff2b29b60 am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'

* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
2010-10-10 17:14:53 -07:00
Andreas Huber
82864cfa9e am 5dcf588a: am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
Merge commit '5dcf588a81a59142985736d8bb0430586f68ec08'

* commit '5dcf588a81a59142985736d8bb0430586f68ec08':
  Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
2010-10-10 17:14:35 -07:00
James Dong
748b92941f am d31fc239: am 6dcdfdb4: Merge "Name the writer threads" into gingerbread
Merge commit 'd31fc2397a494fc54679ac8fdb52983b60287183'

* commit 'd31fc2397a494fc54679ac8fdb52983b60287183':
  Name the writer threads
2010-10-10 17:13:51 -07:00
Andreas Huber
9cb47a6f1d am 14ea1048: am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
Merge commit '14ea1048e7e8a4b40836b5601bc86b91663525cb'

* commit '14ea1048e7e8a4b40836b5601bc86b91663525cb':
  Disable the access unit timeout temporarily while a seek operation is in progress.
2010-10-10 17:13:28 -07:00
Jean-Baptiste Queru
20d7f36a40 am bd1454f5: Merge "Include debugger connection status in error entry"
Merge commit 'bd1454f5005619b69d887fee6a7a4891b3323d18' into gingerbread-plus-aosp

* commit 'bd1454f5005619b69d887fee6a7a4891b3323d18':
  Include debugger connection status in error entry
2010-10-10 17:00:59 -07:00
Gilles Debunne
f925e4699a resolved conflicts for merge of 5d146549 to master
Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b
2010-10-10 16:50:28 -07:00
Jean-Baptiste Queru
0140c05b34 Merge "Include debugger connection status in error entry" 2010-10-10 16:49:54 -07:00
David Brown
418378482b am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp

* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
  Don't manually create CallerInfo objects from SipPhone
2010-10-10 16:44:01 -07:00
Mike Lockwood
5e7a919b3f am 2f77c3e4: Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
Merge commit '2f77c3e4de3d68904a6a872d53283775b3a5c349' into gingerbread-plus-aosp

* commit '2f77c3e4de3d68904a6a872d53283775b3a5c349':
  GPS: Fix another race condition in GPS HAL initialization
2010-10-10 16:41:28 -07:00
Justin Ho
074547f689 am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
Merge commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df' into gingerbread-plus-aosp

* commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df':
  Updated media playback controls, unlock screen, misc framework assets
2010-10-10 16:38:14 -07:00
Mike Lockwood
29a4f07b7e Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread 2010-10-10 16:32:49 -07:00
Justin Ho
9cfdf64d46 Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread 2010-10-10 16:30:01 -07:00
Eric Laurent
ed0a663d96 am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c'

* commit '4f21e517d09b9d793d20d64547df330fba705b3c':
  Added getter for session Id to AudioSink
2010-10-10 16:06:04 -07:00
Andreas Huber
caeaec4790 am d96a068c: am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
Merge commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76'

* commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
2010-10-10 16:05:44 -07:00
Vasu Nori
194b50f374 am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread
Merge commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5' into gingerbread-plus-aosp

* commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5':
  bug:3082865 don't use IN to construct sql to delete downloads
2010-10-10 15:54:26 -07:00
Vasu Nori
ad96c8bba6 Merge "bug:3082865 don't use IN to construct sql to delete downloads" into gingerbread 2010-10-10 15:51:42 -07:00
Romain Guy
5239349d5f Merge "Reset the dirty region after drawing in hardware." 2010-10-10 15:49:14 -07:00
Brad Fitzpatrick
e0ab7c5c70 am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp

* commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
2010-10-10 15:30:55 -07:00
Xavier Ducrohet
594c08ff6d am 4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d' into gingerbread-plus-aosp

* commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d':
  Avoid pre-processing images when they won't be used
2010-10-10 15:19:58 -07:00
Xavier Ducrohet
511f223765 Merge "Avoid pre-processing images when they won't be used" into gingerbread 2010-10-10 15:14:34 -07:00
Jeff Brown
a16d82c248 am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp

* commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32':
  Added more robust tracking and cancelation of events.
2010-10-10 14:50:38 -07:00
Jeff Brown
f817a6e0fd Merge "Added more robust tracking and cancelation of events." into gingerbread 2010-10-10 14:47:57 -07:00
Jeff Brown
90f0cee685 Added more robust tracking and cancelation of events.
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.

Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.

Pruned some of the input dispatcher log output.

Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources.  This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.

Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
2010-10-10 14:45:51 -07:00
Chung-yih Wang
f700eb2cfa am 77880ae4: am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread
Merge commit '77880ae4187d92506848249585687fc9d0c0dd25'

* commit '77880ae4187d92506848249585687fc9d0c0dd25':
  SipService: add permission check for using API
2010-10-10 14:21:18 -07:00
Dianne Hackborn
63a611986c am b77455ee: am 78d68836: Implement tracking of package install times.
Merge commit 'b77455ee290691b036ac79236a93e57ff294ef0c'

* commit 'b77455ee290691b036ac79236a93e57ff294ef0c':
  Implement tracking of package install times.
2010-10-10 14:20:34 -07:00
Marco Nelissen
ae48bfb46d am 779a6e41: (-s ours) am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit '779a6e41d7e5cdb27b802551249257d600dc2d27'

* commit '779a6e41d7e5cdb27b802551249257d600dc2d27':
  Do not merge.
2010-10-10 14:20:06 -07:00
Kenny Root
a51fede3c3 am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread
Merge commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124'

* commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124':
  Symlink application lib directory when on SD card
2010-10-10 14:19:52 -07:00