Commit Graph

18983 Commits

Author SHA1 Message Date
Kenny Root
ffeaa5c0a0 am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit '2c3360fe9c03536cbfd77267170b73c120c071ac' into gingerbread-plus-aosp

* commit '2c3360fe9c03536cbfd77267170b73c120c071ac':
  Remove lingering system app native libs in /data
2010-10-05 14:07:29 -07:00
Kenny Root
2daafa5af9 Merge "Remove lingering system app native libs in /data" into gingerbread 2010-10-05 14:04:26 -07:00
Jeff Brown
da5aa4cd99 am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
Merge commit '78d15acfb20269ce263ce19514a2c0e7a98409e2' into gingerbread-plus-aosp

* commit '78d15acfb20269ce263ce19514a2c0e7a98409e2':
  Make secure views tolerate IME overlays.
2010-10-05 13:17:04 -07:00
Kenny Root
cc5b070f17 am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread
Merge commit '8735c4cda00de26127d694bfbc81e192c4caca44' into gingerbread-plus-aosp

* commit '8735c4cda00de26127d694bfbc81e192c4caca44':
  Get correct native library path on reinstall
2010-10-05 13:13:36 -07:00
Dianne Hackborn
54cf1d857a am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread
Merge commit 'e02e41f484a115b5278dcc07f2d6c90819279800' into gingerbread-plus-aosp

* commit 'e02e41f484a115b5278dcc07f2d6c90819279800':
  DO NOT MERGE: Get rid of status bar's dim during night.
2010-10-05 13:13:25 -07:00
Jeff Brown
1a727bd085 Merge "Make secure views tolerate IME overlays." into gingerbread 2010-10-05 13:06:05 -07:00
Mike Lockwood
81833f3059 resolved conflicts for merge of 2f65a99f to gingerbread-plus-aosp
Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059
2010-10-05 16:00:13 -04:00
Kenny Root
0f85f28b21 Merge "Get correct native library path on reinstall" into gingerbread 2010-10-05 12:48:46 -07:00
Dianne Hackborn
d39316d69e Merge "DO NOT MERGE: Get rid of status bar's dim during night." into gingerbread 2010-10-05 12:48:40 -07:00
Mike Lockwood
5bf21bce37 Merge changes Ic5551c94,I0207f7f7 into gingerbread
* changes:
  GPS: Clean up GPS API extension initialization in JNI code.
  GPS: Add support for AGpsRilInterface.
2010-10-05 12:36:34 -07:00
Jeff Brown
35cf0e9854 Make secure views tolerate IME overlays.
Change-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8
2010-10-05 12:26:23 -07:00
Robert Greenwalt
ef03f5a047 am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread
Merge commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b' into gingerbread-plus-aosp

* commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b':
  Add supporting MCC=450(Korea)
2010-10-05 12:24:47 -07:00
Robert Greenwalt
3a6f070d32 Merge "Add supporting MCC=450(Korea)" into gingerbread 2010-10-05 11:46:12 -07:00
Brett Chabot
3f58b735ac am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp

* commit 'b9a40068b590b86904b40bf466571b140d0f94b4':
  Failing test cleanup.
2010-10-05 11:05:37 -07:00
Brett Chabot
5e848fd6e8 Merge "Failing test cleanup." into gingerbread 2010-10-05 11:00:07 -07:00
Adam Powell
6e01d342c9 am abcbb1a1: Fix bug 3061544 and some clipping errors.
Merge commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66' into gingerbread-plus-aosp

* commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66':
  Fix bug 3061544 and some clipping errors.
2010-10-04 23:16:00 -07:00
Hung-ying Tyan
2fb7b10595 am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit '718e0033e69fa7d1db12242324ab9098ac430bf5' into gingerbread-plus-aosp

* commit '718e0033e69fa7d1db12242324ab9098ac430bf5':
  SIP: add SERVER_UNREACHABLE error code.
2010-10-04 23:07:43 -07:00
Hung-ying Tyan
94e8d04615 am 1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Merge commit '1862af57b2c5ca5387b12974e8ef661651edb97d' into gingerbread-plus-aosp

* commit '1862af57b2c5ca5387b12974e8ef661651edb97d':
  SipService: supply PendingIntent when open a profile.
2010-10-04 23:07:39 -07:00
Dianne Hackborn
445a624a24 am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit '6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283' into gingerbread-plus-aosp

* commit '6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283':
  Make it easier to figure out whether an app can go on sd card.
2010-10-04 23:04:53 -07:00
Hung-ying Tyan
e1fd7ab671 Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread 2010-10-04 23:03:26 -07:00
Hung-ying Tyan
8ab7523752 Merge "SipService: supply PendingIntent when open a profile." into gingerbread 2010-10-04 23:02:55 -07:00
Dianne Hackborn
de5ce1388d Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread 2010-10-04 23:00:25 -07:00
Neal Nguyen
7d9834ec81 am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Merge commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp

* commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368':
  Fixing some flakiness of some DL Manager tests.
2010-10-04 21:09:52 -07:00
Neal Nguyen
f39ed4b552 Merge "Fixing some flakiness of some DL Manager tests." into gingerbread 2010-10-04 21:07:37 -07:00
Jeff Brown
2c7d39750c am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.
Merge commit '79a3981e3885b9144bb3d458682141eed7365939' into gingerbread-plus-aosp

* commit '79a3981e3885b9144bb3d458682141eed7365939':
  Fix Looper leaks in MediaRecorderStressTest.
2010-10-04 21:05:02 -07:00
Mathias Agopian
8a4dfa9661 am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp

* commit 'f461930872beb4362998642c115691bdd2e94617':
  fix [2835280] Add support for cancelling buffers to ANativeWindow
2010-10-04 20:21:14 -07:00
Mathias Agopian
56b5c2861d am ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit 'ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp

* commit 'ef11530874f86570aa04a10c16a416b274b3fdf5':
  fix build. SurfaceView.setFrame needed to be hidden
2010-10-04 20:18:51 -07:00
Mathias Agopian
46b489f3d4 Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread 2010-10-04 20:17:25 -07:00
Mathias Agopian
19957553cb fix [2835280] Add support for cancelling buffers to ANativeWindow
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.

Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
2010-10-04 20:10:11 -07:00
Mathias Agopian
6263c831ec am 19058877: Merge "refactored screenshot code" into gingerbread
Merge commit '19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp

* commit '19058877df9bf94f197a72855f810f7f6bf8d068':
  refactored screenshot code
2010-10-04 20:06:51 -07:00
Mathias Agopian
d3f6ef560a am b9aacfdf: Merge "new screencap command" into gingerbread
Merge commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59' into gingerbread-plus-aosp

* commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59':
  new screencap command
2010-10-04 20:06:47 -07:00
Mathias Agopian
566b728c93 Merge "refactored screenshot code" into gingerbread 2010-10-04 20:04:42 -07:00
Mathias Agopian
7b8fda505e Merge "new screencap command" into gingerbread 2010-10-04 20:04:37 -07:00
Adam Powell
3568e83037 am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
  Fix bug 3061769
2010-10-04 19:59:35 -07:00
Adam Powell
e9a5488e1a Merge "Fix bug 3061769" into gingerbread 2010-10-04 19:56:49 -07:00
Mathias Agopian
ff87f54349 am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Merge commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3' into gingerbread-plus-aosp

* commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3':
  fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
2010-10-04 19:52:41 -07:00
Mathias Agopian
bfdc35dd45 Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread 2010-10-04 19:50:16 -07:00
Elliott Hughes
465ec633d7 am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
Merge commit '7280f2155c37b00359c3fb050e2b067dcd74db40' into gingerbread-plus-aosp

* commit '7280f2155c37b00359c3fb050e2b067dcd74db40':
  Manually revert a single-line error inserted by OpenJDK.
2010-10-04 18:55:32 -07:00
Elliott Hughes
58db5f304d Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread 2010-10-04 18:51:38 -07:00
James Dong
126b49d939 am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp

* commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54':
  Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-04 18:39:52 -07:00
James Dong
e044dfb1de Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread 2010-10-04 18:37:48 -07:00
Nick Pelly
e26f5e72cf am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp

* commit '15f107b151deff1f25f1255bdbcb630ed576ac8d':
  New API stubs: NdefMessage and NdefRecord.
2010-10-04 18:27:27 -07:00
Nick Pelly
377bf20f79 Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread 2010-10-04 18:21:57 -07:00
Gilles Debunne
910e71b6f4 am 52810607: Revert "Restored ic_dialog_menu_generic asset."
Merge commit '528106070b6622e82fd22783007f6dbc29b96701' into gingerbread-plus-aosp

* commit '528106070b6622e82fd22783007f6dbc29b96701':
  Revert "Restored ic_dialog_menu_generic asset."
2010-10-04 18:13:34 -07:00
Gilles Debunne
c752ddf0ae am e91398d1: Revert for 68833 and 68483 which introduced new assets instead of just updating.
Merge commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88' into gingerbread-plus-aosp

* commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88':
  Revert for 68833 and 68483 which introduced new assets instead of just updating.
2010-10-04 17:53:55 -07:00
Mathias Agopian
df85c455c3 refactored screenshot code
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.

we also now have some client code to interface with the screenshot service.

it's now possible to request a screenshot at a lower resolution.

Change-Id: I33689bba98507ab928d0898b21596d0d2fe4b953
2010-10-04 17:36:17 -07:00
Kenny Root
2a877ed73a am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Merge commit 'f84a5918f5e0572c0280fa705970ef7459b45393' into gingerbread-plus-aosp

* commit 'f84a5918f5e0572c0280fa705970ef7459b45393':
  Use pread() in ZipFileRO for Linux
2010-10-04 17:12:10 -07:00
Kenny Root
085996210c Merge "Use pread() in ZipFileRO for Linux" into gingerbread 2010-10-04 17:08:26 -07:00
Gilles Debunne
64e8d24969 am c37eac24: Restored ic_dialog_menu_generic asset.
Merge commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5' into gingerbread-plus-aosp

* commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5':
  Restored ic_dialog_menu_generic asset.
2010-10-04 17:03:25 -07:00
Gilles Debunne
6ce2e6e4bc am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Merge commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp

* commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee':
  DO NOT MERGE. Select word no longer selects spaces between words.
2010-10-04 16:45:32 -07:00