summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make AllAudio really include all audioJean-Baptiste Queru2011-06-101-0/+2
| | | | Change-Id: I14aa532aa6e719d1f4d9e6a39870099553275a57
* am 5a8455c3: am 75749ab1: Merge "Set locale based on SIM preferred ↵Robert Greenwalt2011-06-104-7/+73
|\ | | | | | | | | | | | | language." into honeycomb-LTE * commit '5a8455c3c625201f3ae6b9ce32913bf97ba61cc8': Set locale based on SIM preferred language.
| * am 75749ab1: Merge "Set locale based on SIM preferred language." into ↵Robert Greenwalt2011-06-094-7/+73
| |\ | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22': Set locale based on SIM preferred language.
| | * Merge "Set locale based on SIM preferred language." into honeycomb-LTERobert Greenwalt2011-06-094-7/+73
| | |\
| | | * Set locale based on SIM preferred language.Kazuhiro Ondo2011-06-094-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless user had selected a desired locale, EFli or EFpl will be used to decide the locale to be used. Note this locale setting is not persistent - only valid while SIM card is present. Change-Id: I1f3945f7bc02624dff94b90e7f1a658a136033e8
* | | | am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg ↵James Dong2011-06-100-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 * commit 'dc03da0444803983aef4988475f2d5dcdf0283e9': Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
| * | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 ↵James Dong2011-06-092-12/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | seconds - do not merge."" into honeycomb-mr2 * commit '2488a94350e0c0b088da2646557c9a0f3a0e9847': Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
| | * | am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do ↵James Dong2011-06-092-12/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not merge."" into honeycomb-mr2 * commit 'e3b80c838753fe8c9049950216c6379098465810': Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
| | | * \ Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" ↵James Dong2011-06-092-12/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | | * | Revert "Add avg bandwidth estimate every 2 seconds - do not merge."James Dong2011-05-192-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec78f551b575b0274cbe796f8e08a9df1a706680.
* | | | | | am 6d60190a: am e502c536: am b3174c46: UsbService: Fix JNI reference leakMike Lockwood2011-06-101-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6d60190a3156e0ac69c800bbb10691b70ae9bd54': UsbService: Fix JNI reference leak
| * | | | | am e502c536: am b3174c46: UsbService: Fix JNI reference leakMike Lockwood2011-06-091-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'e502c5364f8e715eb0da54441460b8f3cb76b7ff': UsbService: Fix JNI reference leak
| | * | | | am b3174c46: UsbService: Fix JNI reference leakMike Lockwood2011-06-091-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | * commit 'b3174c46ade0be4628813a74b317da538e367bc8': UsbService: Fix JNI reference leak
| | | * | UsbService: Fix JNI reference leakMike Lockwood2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://code.google.com/p/android/issues/detail?id=17365 Change-Id: Ice0174e0db2a785d32ac16694ebf3b7ddb1b7fb3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | am e9f203e4: am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of ↵Justin Ho2011-06-101-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | large devices to match xlarge" into honeycomb-mr2 * commit 'e9f203e44363f0ee035aa2cd6aad3d5680e6c94f': Updating default wallpaper of large devices to match xlarge
| * | | | am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices ↵Justin Ho2011-06-091-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | to match xlarge" into honeycomb-mr2 * commit '9b0a8f9a92b7b4579ecf5973d3fe61da7950fa93': Updating default wallpaper of large devices to match xlarge
| | * | | am 1d3173c3: Merge "Updating default wallpaper of large devices to match ↵Justin Ho2011-06-091-0/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | xlarge" into honeycomb-mr2 * commit '1d3173c3dc93bb4f2efc5b059fec8e7577b3258a': Updating default wallpaper of large devices to match xlarge
| | | * | Merge "Updating default wallpaper of large devices to match xlarge" into ↵Justin Ho2011-06-091-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | honeycomb-mr2
| | | | * | Updating default wallpaper of large devices to match xlargeJustin Ho2011-06-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
* | | | | | am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f ↵Xavier Ducrohet2011-06-103-20/+58
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '48305f327ff3839ddbfa5a6fb42a57150a69480c': Merge 06942bc4 from hc-mr1. Merge 988eeeb5 from hc-mr1.
| * | | | | am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2Xavier Ducrohet2011-06-093-20/+58
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e0f71181792780b55826bcc562ae79951e76f1b': Merge 06942bc4 from hc-mr1. Merge 988eeeb5 from hc-mr1.
| | * | | | am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2Xavier Ducrohet2011-06-093-20/+58
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ee28811ad208d224ac8d317e4644aabc9ffb886': Merge 06942bc4 from hc-mr1. Merge 988eeeb5 from hc-mr1.
| | | * | | Merge changes Idbb70f53,I10426a3f into honeycomb-mr2Xavier Ducrohet2011-06-093-20/+58
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | * changes: Merge 06942bc4 from hc-mr1. Merge 988eeeb5 from hc-mr1.
| | | | * | Merge 06942bc4 from hc-mr1.Xavier Ducrohet2011-06-082-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layoutlib - use the new getParser callback when possible. Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
| | | | * | Merge 988eeeb5 from hc-mr1.Xavier Ducrohet2011-06-083-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for custom declare-styleable attr with enum/flag in layoutlib. Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
* | | | | | am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright ↵Conley Owens2011-06-100-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacenc/amrwbenc: Convert line breaks to Unix style" * commit 'e668c0b69896996040f394e0a95f71dd4b9c6257': stagefright aacenc/amrwbenc: Convert line breaks to Unix style
| * | | | | am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line ↵Conley Owens2011-06-09185-30089/+30089
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breaks to Unix style" * commit '644f36eab4eb9911ad897c9caae68b9c5a72388f': stagefright aacenc/amrwbenc: Convert line breaks to Unix style
| | * \ \ \ \ am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ↵Conley Owens2011-06-09185-30089/+30089
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style" * commit 'd8b027b18f5a922ef729c6ee363eecb053358d47': stagefright aacenc/amrwbenc: Convert line breaks to Unix style
| | | * \ \ \ \ Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
| | | |\ \ \ \ \
| | | | * | | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | | | | | | | | Merge "New device policy to disable camera."Ben Komalo2011-06-106-1/+145
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | New device policy to disable camera.Ben Komalo2011-06-106-1/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new policy that a DeviceAdmin can use to disable _all_ cameras on the device. A separate CL will be made on the media side to watch this policy bit and act accordingly. Bug: 4185303 Change-Id: I700cfc4a8317bb74087ccae39346d74467fc58b2
* | | | | | | | | | Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing ↵Jamie Gennis2011-06-1013-6/+385
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via Binder."
| * | | | | | | | | | Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via ↵tedbo2011-06-0913-6/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binder. This adds a new ParcelSurfaceTexture.java class that can be instantiated with a SurfaceTexture and used to send the corresponding ISurfaceTexture interface to another process via Binder. The ParcelSurfaceTexture java object can then be used to create an ANativeWindow based on the SurfaceTextureClient interface. Change-Id: Ie38ea948b866e52f36a6d0f6cde19b54a8546817
* | | | | | | | | | | Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on ↵James Dong2011-06-101-9/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index OMX_IndexParamPortDefinition"
| * | | | | | | | | | | Call storeMetaDataInVideoBuffers() before get/setParameters() on index ↵James Dong2011-06-081-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMX_IndexParamPortDefinition This can potentially save lot of memory for video recording use case since the video encoder can advertise a much smaller size of the input buffers which are allocated by SF by default. Change-Id: I582a356cd02c7852e13f2713d90ad5f1eb43177d
* | | | | | | | | | | | Merge "Correctly handle crop rect event in SoftAVC.cpp"James Dong2011-06-102-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Correctly handle crop rect event in SoftAVC.cppJames Dong2011-06-092-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Width and height of the video frame was incorrectly overwritten when a cropping need was detected. Using a separate crop width and crop height resolves the problem. Change-Id: I8a371c7fe7f8417a7995d7a7fe231120274ea0c8 related-to-bug: 4575591
* | | | | | | | | | | | Refactor some of TextToSpeechNarayan Kamath2011-06-102-134/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required to let the Settings code to the same logic and not have to roll it's own. Change-Id: I2766b8562c940182a2954555fb1854889c3ac91a
* | | | | | | | | | | | Merge "Make dumpsys(media.player) more useful by having AwesomePlayer ↵Andreas Huber2011-06-106-44/+255
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | populate it."
| * | | | | | | | | | | | Make dumpsys(media.player) more useful by having AwesomePlayer populate it.Andreas Huber2011-06-086-44/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
* | | | | | | | | | | | | Merge "Don't hardcode the default engine."Narayan Kamath2011-06-101-20/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't hardcode the default engine.Narayan Kamath2011-06-101-20/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One point to note is that no TTS engine will be selected by default if there are no system TTS engines. Change-Id: I397061e3cf29b8a1c66e7864262b43621ef5100d
* | | | | | | | | | | | | | Merge WebKit at r84325: Update user agent string.Ben Murdoch2011-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I927bd1cfadb3cc5b68f93f761d4d82cdc4f54439
* | | | | | | | | | | | | | Merge "Some TTS fixes."Narayan Kamath2011-06-103-17/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Some TTS fixes.Narayan Kamath2011-06-103-17/+70
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (a) Document the undocumented queue mode (mode == 2) (b) intern strings to fix a bug in removeCallbacksAndMessages (c) remove an unnecessarly lock object, change the field it guarded to volatile. Change-Id: If46bbfe2afb047b3ba5b3cb9a90c292656379ec1
* | | | | | | | | | | | | | Merge "Voicemail provider contract definition."Debashish Chatterjee2011-06-101-0/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Voicemail provider contract definition.Debashish Chatterjee2011-06-081-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defines the URLs and columns of the new voicemail provider. Also defines the broadcast intents sent by the provider. Change-Id: I8e9b8744a8ea6e378ca98712f3d136a99302cc2d
* | | | | | | | | | | | | | | Merge "Voicemail related fields in calllog provider."Debashish Chatterjee2011-06-101-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Voicemail related fields in calllog provider.Debashish Chatterjee2011-06-061-0/+15
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added a new type - VOICEMAIL_TYPE - Added a new field 'voicemail_uri', which be set only for entries of type VOICEMAIL_TYPE. Change-Id: Icf7da334dd98b31a65d71c0393b670f63f64bc68
generated by cgit v1.1 at 2025-02-03 12:16:11 +0000