29282 Commits

Author SHA1 Message Date
Chia-chi Yeh
527ed66d41 am 2ac479fa: am a83987d2: Merge "RTP: integrate the echo canceller from speex." into gingerbread
Merge commit '2ac479faeb03daa5083d91726f7b639984617ba2'

* commit '2ac479faeb03daa5083d91726f7b639984617ba2':
  RTP: integrate the echo canceller from speex.
2010-08-24 12:58:11 -07:00
Chia-chi Yeh
12ac100de4 am 50246cd5: am 5b1f0c9f: Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread
Merge commit '50246cd5df8098a1541b0d90ef7dc8832cfe7e11'

* commit '50246cd5df8098a1541b0d90ef7dc8832cfe7e11':
  RTP: reduce the latency by overlapping AudioRecord and AudioTrack.
2010-08-24 12:57:47 -07:00
Brad Fitzpatrick
5107ef6825 Merge "resolved conflicts for merge of 0b7b9807 to master" 2010-08-24 12:55:43 -07:00
Daniel Sandler
99aa17a00e Merge "More final artwork for status bar." 2010-08-24 12:43:42 -07:00
Daniel Sandler
aead95f339 More final artwork for status bar.
Change-Id: Iaa79567bf6f1c36bd4249eb756e694dc74730fef
2010-08-24 15:41:28 -04:00
Brad Fitzpatrick
96fd5af681 resolved conflicts for merge of 0b7b9807 to master
Change-Id: If60aeeb47cd06dcc76b88506688c7e4b58cf2208
2010-08-24 12:40:13 -07:00
Daniel Sandler
0bafb29e06 Merge "Final status bar artwork." 2010-08-24 12:38:36 -07:00
Cary Clark
75796bbef7 communicate drawing pause to webkit to pause gif animation
Gif frames continue even if the webkit changes aren't drawn.
When we suspend drawing, suspend the gif animation as well.
This is accomplished by fooling webkit into thinking the
browser window is offscreen. When the webkit drawing is
resumed, invalidate the entire content so the gif animations
start up once more.

requires companion change in external/webkit

http://b/2621902

Change-Id: I1814aa41630820872d62752b75ae94383fdcc5fc
2010-08-24 15:36:08 -04:00
Daniel Sandler
35887dc152 Final status bar artwork.
Change-Id: I7933388ec090a049447ff1b2b3e1560df064c32b
2010-08-24 15:24:04 -04:00
Jean-Baptiste Queru
970e33e696 am bacc3aa8: am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7'

* commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
  Amend previous ndc commit
  Add a method to let a properly permissioned app directly
  Changed SyncOperation.toKey() to not rely on the implementation of
  Squashed commit of the following:
  Add more error checking for ndc
  PackageManagerService: always install native binaries from .apk
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
  Fix a bug where we cleaned an apps external data when upgrading it. :(
  Skip hostname verification when using insecure factory
  Flush binder buffer after setting raw heap to avoid leaking a reference.
  Fix issue #2834005: Android Settings.Secure bypass
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
  Verify hostname where possible, and clarify where not.
2010-08-24 12:09:03 -07:00
Dianne Hackborn
773b769a7e am 6e549d1c: am f467ca08: Merge "More watermark work." into gingerbread
Merge commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb'

* commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb':
  More watermark work.
2010-08-24 11:54:49 -07:00
Dirk Dougherty
91047d3b2c am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd'

* commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-24 11:54:39 -07:00
Kenny Root
8db59adccf resolved conflicts for merge of b037da40 to master
Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121
2010-08-24 11:48:37 -07:00
Jean-Baptiste Queru
46089bd1cb am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp
Merge commit '026231284c44ca8cf789e0d5045c5ae6a91d7766'

* commit '026231284c44ca8cf789e0d5045c5ae6a91d7766':
  Crash when powering off.
2010-08-24 11:22:05 -07:00
Jean-Baptiste Queru
5f981d97e7 am 360ab1df: am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."
Merge commit '360ab1dfb4ca9e33a604a5e2339c87291880faff'

* commit '360ab1dfb4ca9e33a604a5e2339c87291880faff':
  Adds the ability to Android to initiate a 2 Digit Call.
2010-08-24 11:21:59 -07:00
Mathias Agopian
d637bbfa06 am 394c9bf6: am 0c76c7c5: Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread
Merge commit '394c9bf659fdfc5f5a9495159d9a70eaa5772b7e'

* commit '394c9bf659fdfc5f5a9495159d9a70eaa5772b7e':
  add new sensor types for handling gyro data and device orientation
2010-08-24 11:21:42 -07:00
Sean McNeil
5deea0fe60 am 9b7b5c27: am 40a87586: Only monitor recognized uevent devices.
Merge commit '9b7b5c275ef8d7f653efe3f1de9c64c23a899882'

* commit '9b7b5c275ef8d7f653efe3f1de9c64c23a899882':
  Only monitor recognized uevent devices.
2010-08-24 11:21:11 -07:00
Scott Main
9ac16d2dc4 am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2'

* commit '32b07fc6cab290466c010d05667940a9ba5672e2':
  docs: add dev guide for getting user location
2010-08-24 11:21:04 -07:00
Andreas Huber
804539bf76 am 31e71131: am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread
Merge commit '31e71131049c943a388134e796087e109248efcc'

* commit '31e71131049c943a388134e796087e109248efcc':
  Better handling of rtsp connection and disconnection.
2010-08-24 11:20:57 -07:00
James Dong
7741ecc907 am 28a92120: am 3f51fa78: Runtime dump support for MediaWriter
Merge commit '28a92120a702289533a9c9d004bd60f83b2fd98b'

* commit '28a92120a702289533a9c9d004bd60f83b2fd98b':
  Runtime dump support for MediaWriter
2010-08-24 11:20:40 -07:00
Chia-chi Yeh
3f6855ba6c am a102871c: am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
Merge commit 'a102871c7cbb74ebddc53231a871145de61351b0'

* commit 'a102871c7cbb74ebddc53231a871145de61351b0':
  Visualizer: replace the FFT implementation with a faster one.
2010-08-24 11:19:28 -07:00
Kenny Root
14ee4cf305 resolved conflicts for merge of d51a933b to master
Change-Id: Ibc02613d129b0bdbb579c1a4e58147d720301acc
2010-08-24 11:16:28 -07:00
Irfan Sheriff
b1c96fc137 am b65444df: (-s ours) am 80db4381: Merge "DO NOT MERGE Enable all networks on screen on" into gingerbread
Merge commit 'b65444df013020000a0d60491e9cf14c950c9500'

* commit 'b65444df013020000a0d60491e9cf14c950c9500':
  DO NOT MERGE Enable all networks on screen on
2010-08-24 11:02:08 -07:00
Steve Howard
15a4a2cb8e am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit '6d895fdbc023743f3870042e73a5614764e4165b'

* commit '6d895fdbc023743f3870042e73a5614764e4165b':
  Make ProgressBar.setVisibility() remotable.
2010-08-24 11:01:14 -07:00
Trevor Johns
e79486fed8 am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample from build system.
Merge commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3'

* commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3':
  Disabling AccessibilityService sample from build system.
2010-08-24 11:01:02 -07:00
Gilles Debunne
01b5571020 Merge "Added new Holo assets for Check boxes and Radio buttons." 2010-08-24 10:57:20 -07:00
Jean-Baptiste Queru
a4ddf42673 resolved conflicts for merge of c64b916e to master
Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1
2010-08-24 10:45:16 -07:00
Gilles Debunne
b0b18b8de1 Added new Holo assets for Check boxes and Radio buttons.
Change-Id: I9e7e95f16367b2bd20ec1c9231a04834f6f8e8f5
2010-08-24 10:26:17 -07:00
Jean-Baptiste Queru
0a5699654f am f235a519: am ec58dff0: Fix build - remove dead doc link
Merge commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f'

* commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f':
  Fix build - remove dead doc link
2010-08-24 10:25:00 -07:00
Jean-Baptiste Queru
1770b21ab5 am 0460e26a: resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
Merge commit '0460e26a4c9915f77c915d2cc3540969802b02fa'

* commit '0460e26a4c9915f77c915d2cc3540969802b02fa':
  add new sensor types for handling gyro data and device orientation
2010-08-24 10:17:03 -07:00
Wink Saville
b422ca809c am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'

* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
2010-08-24 10:16:42 -07:00
Jean-Baptiste Queru
0fc1b793b6 am b13c9bc5: manual merge
Merge commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6'

* commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6':
  BluetoothHeadset.java:
2010-08-24 10:16:28 -07:00
Romain Guy
104422039b am 5a14271a: am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread
Merge commit '5a14271aacb932ba0d52978c939f74e4c685f7d6'

* commit '5a14271aacb932ba0d52978c939f74e4c685f7d6':
  Load bitmaps in the correct format.
2010-08-24 10:15:51 -07:00
Vasu Nori
4077d7a75d Merge "SQLiteOpenHelper should discard closed singleton database objects" 2010-08-24 10:08:13 -07:00
Kenny Root
53e75ea847 resolved conflicts for merge of 485de781 to master
Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
2010-08-24 09:57:33 -07:00
Nipun Kwatra
d820714e30 am 701b710c: am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
Merge commit '701b710c194181765616520f6d89d450b4b6c1f5'

* commit '701b710c194181765616520f6d89d450b4b6c1f5':
  setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
2010-08-24 09:03:55 -07:00
Dianne Hackborn
37a1e2370f am a3ece8bd: am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread
Merge commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0'

* commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0':
  Fix a few small battery stats problems:
2010-08-24 09:03:45 -07:00
Brian Carlstrom
07d39e9150 am 005f0d08: am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread
Merge commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa'

* commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa':
  Tracking merge of dalvik-dev to gingerbread
2010-08-24 09:03:29 -07:00
Dianne Hackborn
cc5239b78b am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
Merge commit '8b569c8d49924d849793513a5418ef0350320962'

* commit '8b569c8d49924d849793513a5418ef0350320962':
  Fix aapt dump badging to support xlarge screens.
2010-08-24 09:02:43 -07:00
Kenny Root
e0e6a0fc8e am b90b9d54: am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread
Merge commit 'b90b9d54eb6bbc3a4045ff0bf46d3366822e835e'

* commit 'b90b9d54eb6bbc3a4045ff0bf46d3366822e835e':
  Free created FileMap when uncompressing files
2010-08-24 09:02:28 -07:00
Dianne Hackborn
108ef58d9b am c5794ae7: (-s ours) am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
Merge commit 'c5794ae72547cce6cbae1e58df5d32bc0e2520fd'

* commit 'c5794ae72547cce6cbae1e58df5d32bc0e2520fd':
  DO NOT MERGE 2928156  Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
2010-08-24 09:02:16 -07:00
Robert Greenwalt
608dbbe76f am 2b05a95b: (-s ours) am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '2b05a95bccafddac15debdfb5c39107aa3418783'

* commit '2b05a95bccafddac15debdfb5c39107aa3418783':
  DO NOT MERGE Fixing Connectivity
2010-08-24 09:02:05 -07:00
Dianne Hackborn
103bff317b am 5474b0f8: am 39792d22: Fix bugs with granting permissions through onNewIntent().
Merge commit '5474b0f8603ee66413c3e44600ca46f162f3089e'

* commit '5474b0f8603ee66413c3e44600ca46f162f3089e':
  Fix bugs with granting permissions through onNewIntent().
2010-08-24 09:01:54 -07:00
James Dong
7802b20586 am 3fc01525: am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
Merge commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5'

* commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5':
  Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
2010-08-24 09:01:39 -07:00
Wu-cheng Li
eee09313c6 am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread
Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'

* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
  Add camera fps range API.
2010-08-24 09:01:27 -07:00
Cary Clark
e2d37b03f7 am d93ecb3f: (-s ours) am 581f7861: DO NOT MERGE Refactor find and select dialogs
Merge commit 'd93ecb3fab669bb563fcb903966e854a593ceace'

* commit 'd93ecb3fab669bb563fcb903966e854a593ceace':
  DO NOT MERGE Refactor find and select dialogs
2010-08-24 09:00:53 -07:00
android-build SharedAccount
748795096f Merge commit '7e8f0c7454339d240761684807135fbc490e99f6' 2010-08-24 08:50:35 -07:00
android-build SharedAccount
ce7f03be4c Merge commit '6cf5eb0606ecdc22e7c431971a0c621413564840' 2010-08-24 08:48:56 -07:00
Steve Block
fbc2030426 Merge "Hook up device sensors for DeviceOrientation" 2010-08-24 08:35:03 -07:00
Steve Block
bb9db22fbb Hook up device sensors for DeviceOrientation
Change-Id: Ic7165a07a02e3c38165b2f92e3ec7368d2b60e19
2010-08-24 16:33:46 +01:00