48269 Commits

Author SHA1 Message Date
Brad Fitzpatrick
397de169e5 am fae5e289: am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit 'fae5e2894ff3c09f27efac2a7ee6b9cfd4ed14b0':
  Making it possible to call SIP calls with special allowed chars.
2011-03-29 08:53:48 -07:00
Brad Fitzpatrick
37c1bbb51a am 8ef609ab: am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit '8ef609abe56c9872c93fc304037d1e52d4475e5e':
  Fixing the wrong link in YuvImage JavaDoc.
2011-03-29 08:53:38 -07:00
Brad Fitzpatrick
fae5e2894f am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit '6f67e7bf831147257e078dd72a22f2e43e009122':
  Making it possible to call SIP calls with special allowed chars.
2011-03-29 08:45:30 -07:00
Brad Fitzpatrick
8ef609abe5 am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit 'a4206029cbb8f6c02c47db52f84b7d52e154e35a':
  Fixing the wrong link in YuvImage JavaDoc.
2011-03-29 08:45:20 -07:00
Bill Gruber
d7662aea65 am 67a249d6: am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch
* commit '67a249d607e029650104ca71373b09b852614725':
  IAB doc update for final launch
2011-03-29 00:12:49 -07:00
Bill Gruber
67a249d607 am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch
* commit '0b0dbea0bc38087dfa3e82b91c0381154bb8bdfd':
  IAB doc update for final launch
2011-03-29 00:06:18 -07:00
Bill Gruber
0b0dbea0bc am e4f33617: am faede250: IAB doc update for final launch
* commit 'e4f33617c3654bdcb246ee8f74e67d1828cd42c9':
  IAB doc update for final launch
2011-03-29 00:00:37 -07:00
Bill Gruber
e4f33617c3 am faede250: IAB doc update for final launch
* commit 'faede250301e291a060d094c73a25a351f96cbb5':
  IAB doc update for final launch
2011-03-28 23:48:34 -07:00
Jeff Sharkey
67bcd82b40 Merge "Support Ctrl-based EditText movement." 2011-03-28 19:57:10 -07:00
Bill Gruber
faede25030 IAB doc update for final launch
Change-Id: I5173422eb65f4effc61162c2b172750dee0a6a2c
2011-03-28 19:50:20 -07:00
Matthew Xie
571a24bfe3 Merge "Use mask_eighth_bit function to replace is_ascii check." 2011-03-28 18:13:59 -07:00
Jack Palevich
d6f4caca5d Merge "Add Java support for a few accidentally omitted OpenGL ES APIs." 2011-03-28 17:08:50 -07:00
Iliyan Malchev
d2b1f29aa0 Merge "frameworks/base: some camera-interface cleanup" 2011-03-28 17:07:02 -07:00
Iliyan Malchev
40c364136f frameworks/base: some camera-interface cleanup
Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct
image_rect_struct are no longer used (instead, the necessary information is
passed through ANativeWindow.)

Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-28 16:28:57 -07:00
Jack Palevich
73108675c9 Add Java support for a few accidentally omitted OpenGL ES APIs.
Fixes 3491494 Support OpenGL APIs: glBlendEquationSeparate and friends

Change-Id: I8fdc94b6ea14e9a7e3d402a965d500790a3d8f77
2011-03-28 14:49:12 -07:00
Andreas Huber
3a28b022bc Ignore OMX codec messages once we're in ERROR state.
Change-Id: I2bdf58ed705a641be1f3aec89fa41cada6acfc96
related-to-bug: 4175573
2011-03-28 14:48:28 -07:00
Wink Saville
45538666db am 94a19db5: am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
* commit '94a19db5a78d3f43b01fa10bd09788f68debbcab':
  DataConnectionTracker cleanup when disposed.
2011-03-28 12:15:28 -07:00
Wink Saville
94a19db5a7 am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
* commit '59d1b26a6a4b9b2de829d62af2179f57deb79391':
  DataConnectionTracker cleanup when disposed.
2011-03-28 12:13:22 -07:00
Wink Saville
59d1b26a6a Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 2011-03-28 12:11:42 -07:00
Mike Lockwood
60355780ea am 038c7297: am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '038c7297c9e2e4b6cdb490ac9fe7102da434278a':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:04:29 -07:00
Mike Lockwood
038c7297c9 am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit 'b115807aaf0fc6326903302be9bd9ff3877fa968':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:02:58 -07:00
Mike Lockwood
b115807aaf am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:00:33 -07:00
Ramesh Sudini
3bbe33d703 DataConnectionTracker cleanup when disposed.
Change-Id: I4db442ae110531f33280ceb626fc260d392a1bd5
2011-03-28 11:00:26 -07:00
Mike Lockwood
7661dd8de1 Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 2011-03-28 10:58:03 -07:00
Andreas Huber
ab13a89c99 am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:34:06 -07:00
Andreas Huber
a4a81aef39 am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit 'e7cedad2b8408a13c610f3a7fcf13597a432a37d':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:26:21 -07:00
Andreas Huber
e7cedad2b8 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:16:52 -07:00
Andreas Huber
2edbdcc6f2 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Mike Lockwood
8f8c6023f2 UsbService: Fix JNI local reference leaks in the USB host support code
Bug: 4175857

Change-Id: I8b385f2257e509b0fb4d5f9516e9813b8165352d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-27 19:35:43 -07:00
Wink Saville
3c630f3363 am 238b5c4e: am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE
* commit '238b5c4e8470c51582ed53e3987626720ab4c013':
  Work around for operator not being correct.
2011-03-26 16:55:23 -07:00
Wink Saville
8d4857ce4a am 9c2c7ace: am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE
* commit '9c2c7ace9e5658cb2c16b6e720ac39ea349d5921':
  Add some debug to apn list creation routines.
2011-03-26 16:53:32 -07:00
Wink Saville
238b5c4e84 am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE
* commit '9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e':
  Work around for operator not being correct.
2011-03-26 16:52:53 -07:00
Wink Saville
9c2c7ace9e am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE
* commit '3420f85cc65af8e3ec6c651667c8cffbac60ba4e':
  Add some debug to apn list creation routines.
2011-03-26 16:51:13 -07:00
Wink Saville
9eac2c077a Merge "Work around for operator not being correct." into honeycomb-LTE 2011-03-26 16:50:17 -07:00
Wink Saville
3420f85cc6 Merge "Add some debug to apn list creation routines." into honeycomb-LTE 2011-03-26 16:48:35 -07:00
Ramesh Sudini
4bdadc2e6c am 2f4f92a9: am fbe284b6: Telephony: Fix eHRPD Service State Mapping.
* commit '2f4f92a9974de34aa62974335e700a554426d0c2':
  Telephony: Fix eHRPD Service State Mapping.
2011-03-26 09:30:25 -07:00
Ramesh Sudini
2f4f92a997 am fbe284b6: Telephony: Fix eHRPD Service State Mapping.
* commit 'fbe284b6756b44819e9f4d13938bad06b238d112':
  Telephony: Fix eHRPD Service State Mapping.
2011-03-26 09:23:23 -07:00
Wink Saville
2a3aa2a32e Work around for operator not being correct.
This is a STOPSHIP work-around until we figure out why
getSIMOperatorNumeric is not returning valid values.
It has returned NULL, "00000", "310004", "311480" and
once a value "83????", I don't remember the exact value.

Change-Id: I4f1d16c853047b72dd987572d3d67dcc2cd697a2
2011-03-26 09:13:20 -07:00
Ramesh Sudini
fbe284b675 Telephony: Fix eHRPD Service State Mapping.
Change-Id: I415c11dc0e1817f7772160c1103105d6007ffdff
2011-03-26 08:40:32 -07:00
Wink Saville
c6c7ebd92c Add some debug to apn list creation routines.
Change-Id: Ic5055daefd50b6371f129d82313c533a04cd75b1
2011-03-26 08:04:30 -07:00
Dirk Dougherty
88a88b5e4a am 538626ec: am 79da5c2d: am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '538626ec0f9e05a0a4720c930cb380babdfdd9f9':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:29:51 -07:00
Dirk Dougherty
538626ec0f am 79da5c2d: am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '79da5c2da018a2066b7e5d6e8de0c03d00c20492':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:27:18 -07:00
Dirk Dougherty
79da5c2da0 am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '0b9bacc69314fc6480d1ebe67b7ee0d0aebca5c0':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:25:45 -07:00
Mathias Agopian
1b339099b9 Merge "merge libsurfaceflinger_client into libgui" 2011-03-25 19:25:32 -07:00
Dirk Dougherty
0b9bacc693 am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '085baa2cc3f2d23523377b1df390cec5d3bf1445':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:22:55 -07:00
Dirk Dougherty
085baa2cc3 Doc change: Fix scale on highlights screen shots.
Change-Id: Id2608498baac70dc69d7b716bbb00f0799af03ca
2011-03-25 19:07:30 -07:00
Mathias Agopian
696257ccf3 merge libsurfaceflinger_client into libgui
this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
2011-03-25 18:42:40 -07:00
Andreas Huber
59529e1474 After a seek there's a brief period where audio time isn't reestablished.
Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.

Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
2011-03-25 16:40:50 -07:00
Nick Pelly
87e04970ab am a585eb17: am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit 'a585eb17aba237b6de393b9fb88e03b996cb63c1':
  NfcAdapterExtras: reset singleton state if initialization fails.
2011-03-25 16:39:06 -07:00
Andreas Huber
e8ab51f593 am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
* commit 'e2cb08bd4c3bc7e7045e107af41f7228d780be04':
  Make sure we post a video event when seeking after seeing video EOS before.
2011-03-25 16:38:57 -07:00