summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Handle hostapd and tether interface changes"Irfan Sheriff2011-07-234-31/+80
|\
| * Handle hostapd and tether interface changesIrfan Sheriff2011-07-234-31/+80
| | | | | | | | | | | | | | | | | | The set config will only update hostapd config file right now and we need to restart after that happens. Also, softap interface is changed to be the regular interface Bug: 5069108 Change-Id: Ibe80129b58e5339f06f186870bcd8f37569c6db3
* | Merge "TwoStatePreference does not fire click events."Svetoslav Ganov2011-07-233-25/+28
|\ \
| * | TwoStatePreference does not fire click events.Svetoslav Ganov2011-07-223-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Event were send in onBindView but since we have fixed the bug of unattached views firing accessibility events and there is no guarantee that the view is attached in onBindView no events were sent. Now posting a runnable so on the next run the UI tread will send the event i.e. after the view is bound and attached. bug:5008841 Change-Id: I4ed914f7fb65d6896f0c55e7c46e6508d2b2f11f
* | | Merge "Fix USB tethering"Mike Lockwood2011-07-234-106/+89
|\ \ \
| * | | Fix USB tetheringMike Lockwood2011-07-234-106/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous approach no longer works with the new USB drivers, since the usb0 interface is no longer enabled by default. This introduced a chicken & egg problem - usb0 will not be enabled until the user tries to start tethering, but Settings will not enable the checkbox unless usb0 is enabled. To fix this we add an explicit call to start USB tethering in the connectivity manager. This will enable RNDIS if necessary and then bring up tethering once usb0 is enabled. Change-Id: Iae1f733366aa6b0dafa66d4c97207794173ef54b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "Tweak APIs for SpellChecker"satok2011-07-224-42/+58
|\ \ \ \
| * | | | Tweak APIs for SpellCheckersatok2011-07-234-42/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Move getSupellcheckerInfo to SpellCheckerSession 2. Change the interface of getSpellCheckerSession 3. Remove a flag in SuggestionsInfo Change-Id: I3debe09e213fc0ab74618eb3504383f2a9447fd9
* | | | | Merge "Display the current ime and subtype name in the ongoing notification"satok2011-07-221-3/+11
|\ \ \ \ \
| * | | | | Display the current ime and subtype name in the ongoing notificationsatok2011-07-231-3/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 4903422 Change-Id: I3eaeb3decb75f687ad2af0d80340b819229c3ebe
* | | | | Merge "Code cleaning"Fabrice Di Meglio2011-07-221-6/+7
|\ \ \ \ \
| * | | | | Code cleaningFabrice Di Meglio2011-07-221-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this was a bit ugly, isnt it? Change-Id: Ic479c180977d73d333afed7696b2920840d92abf
* | | | | | Merge "Deprecate two methods in MediaRecorder.java class"James Dong2011-07-223-106/+10
|\ \ \ \ \ \
| * | | | | | Deprecate two methods in MediaRecorder.java classJames Dong2011-07-223-106/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98fbe628fe77867b97c04f44458948ede2f49d22
* | | | | | | Merge "VPN: increase timeout period to 60 seconds for legacy VPN."Chia-chi Yeh2011-07-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | VPN: increase timeout period to 60 seconds for legacy VPN.Chia-chi Yeh2011-07-221-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some VPN needs more time than others in order to create the secure tunnel. For example, L2TP/IPSec PSK on average needs 15 seconds on WiFi. On mobile connection, variation gets larger, and it sometimes needs more than 30 seconds. This change increases timeout period from 30 to 60 seconds. Change-Id: I6006fd254a7bc91c22f63d2f3f20ea79ee9b05e2
* | | | | | | am 3e930dba: (-s ours) am d1b4c10f: Merge "DO NOT MERGE ↵Svetoslav Ganov2011-07-220-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE * commit '3e930dba58442776b3c921b3dc1980fdba2caed9': DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
| * \ \ \ \ \ \ am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore ↵Svetoslav Ganov2011-07-221-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the default key binsings." into honeycomb-LTE * commit 'd1b4c10fedc04384f40ba7fc30115a1380ce014f': DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
| | * \ \ \ \ \ \ Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default ↵Svetoslav Ganov2011-07-221-3/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key binsings." into honeycomb-LTE
| | | * | | | | | | DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.Svetoslav Ganov2011-07-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHERRY PICK FROM MASTER 1. AccessibilityInjectorTest changes the key bindings and when done restores the defatult ones. The restoreation was not working. bug:4905620 Change-Id: I812bad0b748637ded0ce69ace12517511f62f726
* | | | | | | | | | Merge "Fix the build"Romain Guy2011-07-221-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the buildRomain Guy2011-07-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icdf7e25fff5f1dc0836e67368f6797b60164e8ae
* | | | | | | | | | | Merge "Connect MediaRecorder Native to SurfaceMediaSource"Pannag Sanketi2011-07-2212-75/+269
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Connect MediaRecorder Native to SurfaceMediaSourcePannag Sanketi2011-07-2212-75/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making a connection from MediaRecorder Native layer to the SurfaceMediaSource for the purpose of encoding GL Frames. This will be called from the java side inside the Mobile Filter Framework. The mediarecorder native layer (client), when set the videosource to option VIDEO_SOURCE_FRAMES, asks the StageFrightRecorder on the mediaserver side to create a SurfaceMediaSource object and pass it back as a sp<ISurfaceTexture> object. Using that, the client side will dequeue and queue buffers. Connecting the GL Frames to the obtained sp<ISurfaceTexture> is not part of this CL. Related to bug id: 4529323 Change-Id: I651bec718dd5b935779e7d7a050b841c2d0b0fcd
* | | | | | | | | | | | Merge changes Ibd261f7b,Ifdd234ef,I0e2f0bc3Jamie Gennis2011-07-228-43/+264
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: SurfaceTexture: add the abandon method. SurfaceTexture: add a deadlock scenario test SurfaceMediaSource: remove getAllocator method
| * | | | | | | | | | | SurfaceTexture: add the abandon method.Jamie Gennis2011-07-228-26/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the 'abandon' method to the SurfaceTexture C++ class. This method may be used to put the SurfaceTexture in an abandoned state, causing all ISurfaceTexture methods to fail. Change-Id: Ibd261f7b73f44e2bec36a8508bf92113cfb7cf95
| * | | | | | | | | | | SurfaceTexture: add a deadlock scenario testJamie Gennis2011-07-221-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a test to ensure that a GL driver that's blocking on a call to dequeueBuffer does not block other GL threads from rendering and queueing buffers. Change-Id: Ifdd234effc534b6a9cf8522ca87f64da5bb0bbd6
| * | | | | | | | | | | SurfaceMediaSource: remove getAllocator methodJamie Gennis2011-07-222-13/+0
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the getAllocator method from SurfaceMediaSource because that method is no longer a part of the ISurfaceTexture interface. Change-Id: I0e2f0bc3bc1c8cd3c1b4b14246f07b9b4e3066c3
* | | | | | | | | | | Merge "Nested alpha animations should cause invalidates too Bug #5041061"Romain Guy2011-07-224-1/+41
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Nested alpha animations should cause invalidates tooRomain Guy2011-07-224-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #5041061 Change-Id: I96835449b6b5537872afda90956c5d06d826e841
* | | | | | | | | | | Merge "Fix typo which caused invalid rotations to be returned with ↵Mathias Agopian2011-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NATIVE_WINDOW_TRANSFORM_HINT"
| * | | | | | | | | | | Fix typo which caused invalid rotations to be returned with ↵Mathias Agopian2011-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NATIVE_WINDOW_TRANSFORM_HINT Bug: 4487161 Change-Id: Ib2dfbbef15397b6d90695bd27f25849ca20704f1
* | | | | | | | | | | | Merge "Fix bug 5027071 - Action menu parent consistency"Adam Powell2011-07-221-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix bug 5027071 - Action menu parent consistencyAdam Powell2011-07-221-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that action menus can tolerate moving around in the bar. Change-Id: I2dfb4ea7e647a6c4e84ec78865af6fd858e3f59f
* | | | | | | | | | | | Merge changes I799532f7,I5cffa6ebJamie Gennis2011-07-226-34/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: SurfaceTexture: fix a comment SurfaceTexture: remove getAllocator
| * | | | | | | | | | | | SurfaceTexture: fix a commentJamie Gennis2011-07-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I799532f77f8fbb6b8ee6888fdd8852b6f28e8c33
| * | | | | | | | | | | | SurfaceTexture: remove getAllocatorJamie Gennis2011-07-215-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the SurfaceTexture::getAllocator method, as it's no longer needed. Proper refcounting of the Gralloc buffers is now handled by the IGraphicBufferAlloc binder marshalling code. Change-Id: I5cffa6ebfc1bc5828fb7ce0e0a5b2f55cd8479da
* | | | | | | | | | | | | am 19933916: am ad55d351: Add better routes for secondary DNSRobert Greenwalt2011-07-222-32/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '199339169476d0d6d0ecaa8ed3bff3a9e9a0f430': Add better routes for secondary DNS
| * | | | | | | | | | | | am ad55d351: Add better routes for secondary DNSRobert Greenwalt2011-07-222-32/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad55d35114237071133eb28ded93a014185d4e35': Add better routes for secondary DNS
| | * | | | | | | | | | | Add better routes for secondary DNSRobert Greenwalt2011-07-222-32/+58
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on some devices (multi-homed stingray) this is a problem. Add gateway-ed hostroutes instead so the BP can do it's nonstandard "magical" demultiplexing. bug:5011392 Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb
* | | | | | | | | | | | Merge "Fixing new minResizeWidth/Height API"Adam Cohen2011-07-223-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixing new minResizeWidth/Height APIAdam Cohen2011-07-223-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b57cca32ed7678597e7c0d81dc483ee294537a9
* | | | | | | | | | | | | Merge "Renaming SurfaceEncoder to SurfaceMediaSource"Pannag Sanketi2011-07-225-96/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Renaming SurfaceEncoder to SurfaceMediaSourcePannag Sanketi2011-07-215-96/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to bug id: 4529323 Change-Id: Id820d45a536bd2c65e0a59def564eb5b3ea4a71c
* | | | | | | | | | | | | | Merge "Adding SurfaceEncoder for encoding FilterFrames"Pannag Sanketi2011-07-2210-6/+1673
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Adding SurfaceEncoder for encoding FilterFramesPannag Sanketi2011-07-2110-6/+1673
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding SurfaceEncoder which can be used to encode custom frame data. In a sense, it is reverse of what SurfaceTexture does. SurfaceEncoder takes in frames from a native window and passes them to an encoder, thus acting like a MediaSource. It uses GRAlloc buffers underneath for passing data. The client side sets the geometry, format in the beginning, which cannot be changed while the recording is going on. Currently, there is no common pixel format that both GRAlloc and HAL understand. Also, the encoder cannot encode using the data from the GRAlloc buffers. The SurfaceEncoder_test examines mainly the buffer passage since true encoding cannot be done at this point. SimpleDummyRecorder 'reads' the frames in the same thread as the start(), whereas DummyRecorder 'reads' in a separate thread much like the MPEG4Writer. The test with DummyRecorder is much closer to the real encoding implementation. Related to bug id: 4529323 Change-Id: I58ec19a150f8fe4d6195196dc44f55002b46c7c8
* | | | | | | | | | | | | | Merge "Fixing WifiWatchdog log flag"Irfan Sheriff2011-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixing WifiWatchdog log flagIsaac Levy2011-07-221-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accidentally merged verbose logging - setting to false. Change-Id: I6cd9321c7602d86aac4a8340ef0233310a665bd9
* | | | | | | | | | | | | | Merge "Fix issue #5054723: java.lang.NullPointerException at..."Dianne Hackborn2011-07-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix issue #5054723: java.lang.NullPointerException at...Dianne Hackborn2011-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...android.app.FragmentManagerImpl.execPendingActions(FragmentManager.java:1284) Make sure to commit all pending actions before completing the destroy. Change-Id: I85643e5f7b1221048523bd186b48fb88fc70ca23
generated by cgit v1.1 at 2025-02-13 22:25:25 +0000