drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,704 Commits 1 Branch 0 Tags
Commit Graph

66704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
dbbb0f8a7a am 11001c34: Merge "Bug 5567648 disassociate audio mode and audio focus" 
* commit '11001c344a37ac515328133f46b80a2c92e61b6c':
  Bug 5567648 disassociate audio mode and audio focus
 2012-01-27 14:17:55 -08:00
Jean-Michel Trivi
11001c344a Merge "Bug 5567648 disassociate audio mode and audio focus" 2012-01-27 14:15:37 -08:00
Glenn Kasten
ad73e8dee8 am b975ae45: Merge "Remove optional LVMX service" 
* commit 'b975ae45cb246457c350863975a3ef5b3baa7fb4':
  Remove optional LVMX service
 2012-01-27 14:12:42 -08:00
Glenn Kasten
b975ae45cb Merge "Remove optional LVMX service" 2012-01-27 14:11:16 -08:00
Jean-Baptiste Queru
27d2ab8b27 am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 
* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
  Wi-Fi: Handle disconnect in middle of DHCP operation
 2012-01-27 13:58:03 -08:00
Gilles Debunne
d32003a974 am 566e8baf: Merge "Fix for IOOB when suggestions have disappeared" 
* commit '566e8baf43a08b1000b8c4c24fb14fe94e46394d':
  Fix for IOOB when suggestions have disappeared
 2012-01-27 13:57:16 -08:00
Gilles Debunne
fc361a01ca am ea118122: Merge "Handle tap and move cursor before showing suggestions" 
* commit 'ea1181220deaf1820fb5cc13247d5e976b5543d4':
  Handle tap and move cursor before showing suggestions
 2012-01-27 13:57:14 -08:00
Jean-Baptiste Queru
dc8668c8a7 am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 
* commit '9781870491f4f33403f8d518879a88c20180d7cb':
  Wi-Fi: Handle disconnect in middle of DHCP operation
 2012-01-27 13:55:56 -08:00
Gilles Debunne
566e8baf43 Merge "Fix for IOOB when suggestions have disappeared" 2012-01-27 13:54:50 -08:00
Gilles Debunne
ea1181220d Merge "Handle tap and move cursor before showing suggestions" 2012-01-27 13:54:42 -08:00
Teng-Hui Zhu
88a94f1458 am 91391744: Merge "Revert "Hack to workaround the fact that the EGL context can be"" 
* commit '913917449d4b5da28056a02b81fb49e73f98d9a1':
  Revert "Hack to workaround the fact that the EGL context can be"
 2012-01-27 13:50:07 -08:00
Teng-Hui Zhu
913917449d Merge "Revert "Hack to workaround the fact that the EGL context can be"" 2012-01-27 13:48:25 -08:00
Jean-Baptiste Queru
9781870491 Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 2012-01-27 13:36:49 -08:00
Jean-Michel Trivi
4dd3674e51 Bug 5567648 disassociate audio mode and audio focus 
Don't automatically change the audio focus when
 the audio mode changes. This is best handled by the
 applications that change the audio mode so they
 can address their usecases as they please (for
 instance to define the behavior when switching calls).
Replaced the implicit "mode to focus" behavior with
 two methods to request and abandon audio focus. These
 methods are only to be used by the framework, and maintain
 the logic in AudioService to prevent other apps to request
 audio focus during a call.
A susequent change will update com.android.internal.telephony.CallManager
 to take advantage of these two methods.

Change-Id: If84ebd508e985083e8cac82ece44940c72b5c669
 2012-01-27 13:32:45 -08:00
Jason Sams
85694cf6c7 Merge "Add comment to confusing commands." into graphics-dev 2012-01-27 13:30:20 -08:00
Jason Sams
61e76a7ffa Add comment to confusing commands. 
Change-Id: I7b84b9d8e9b3b595e0bab33d5e219842f6c86f83
 2012-01-27 13:27:01 -08:00
Vishal Mahaveer
21bd79f51c Wi-Fi: Handle disconnect in middle of DHCP operation 
Restore power mode and BT co-ex settings when disconnect
happens in middle of DHCP operation.

Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-01-27 14:51:23 -06:00
Eric Fischer
8220233710 am d4760fc2: Merge "Import translations. DO NOT MERGE" 
* commit 'd4760fc2b731f1ffe1d5f2efb4a887772f1c5150':
  Import translations. DO NOT MERGE
 2012-01-27 12:01:31 -08:00
Eric Fischer
d4760fc2b7 Merge "Import translations. DO NOT MERGE" 2012-01-27 11:58:58 -08:00
Eric Fischer
14f6b58787 am b6c51b9a: Import translations. DO NOT MERGE 
* commit 'b6c51b9a88f80c15d27cef6ea747eeeba0f6e903':
  Import translations. DO NOT MERGE
 2012-01-27 11:55:35 -08:00
Eric Fischer
fb197c2654 Import translations. DO NOT MERGE 
Change-Id: I853c3fd2a3ada0c78e461550dc6c61bb5e09404a
 2012-01-27 11:55:32 -08:00
Eric Fischer
b6c51b9a88 Import translations. DO NOT MERGE 
Change-Id: I16defb344c5a4a253bc34b414f6395a785bd7003
 2012-01-27 11:51:46 -08:00
Glenn Kasten
de57586c90 Remove optional LVMX service 
Change-Id: I64121d320b756e46869b82b79e49aebacbac3a48
 2012-01-27 11:25:51 -08:00
Eric Fischer
37a9388218 am 66ed8578: Merge "Mark locale-neutral configuration strings translatable="false"" 
* commit '66ed857806f0f781df543f436335cba0dfb3bf39':
  Mark locale-neutral configuration strings translatable="false"
 2012-01-27 11:24:55 -08:00
Eric Fischer
66ed857806 Merge "Mark locale-neutral configuration strings translatable="false"" 2012-01-27 11:22:52 -08:00
John Wang
2c911b2416 Adjust the LTE signal bar mapping. 
The new mapping are

  Four  bars: RSRP >= -95dBm
  Three bars: -105 dBm <= RSRP < -95 dBm
  Two   bars: -115 dBm <= RSRP < -105 dBm
  One   bars: RSRP < -115 dBm
  No    bars: No Service

bug:5640958
Change-Id: I9efabaeac33b624ea0a58a4d3760169dff6544f6
 2012-01-27 11:05:24 -08:00
Nick Pelly
1ef4802ab2 am d343bb96: Merge "Fix doc bug." 
* commit 'd343bb9692acd1668cf3683085880d8edd1c53b8':
  Fix doc bug.
 2012-01-27 11:05:19 -08:00
Eric Fischer
53ebe33e76 Mark locale-neutral configuration strings translatable="false" 
Change-Id: I344b871553339b9d98b7bfed74be02dc85b4e195
 2012-01-27 11:04:23 -08:00
Nick Pelly
d343bb9692 Merge "Fix doc bug." 2012-01-27 11:03:57 -08:00
Nick Pelly
d3cb80d2af Fix doc bug. 
Change-Id: Ib7361abb0461d4295e889c505dd45e3a40193451
 2012-01-27 11:03:05 -08:00
Nick Pelly
0026233c15 am fbc659e2: Merge "Fix build: update current.txt" 
* commit 'fbc659e259816b97877f49ff6ca1bd637fd7b7b8':
  Fix build: update current.txt
 2012-01-27 10:37:28 -08:00
Nick Pelly
fbc659e259 Merge "Fix build: update current.txt" 2012-01-27 10:35:12 -08:00
Nick Pelly
21c136a4ec Fix build: update current.txt 
Change-Id: Ic28314e98784ebe513bd2191d3fa6c9bd5674422
 2012-01-27 10:34:18 -08:00
Stephen Hines
2061424da7 am cee905be: Merge "Don\'t wait forever if there are no commands to execute." 
* commit 'cee905be4874f6d3f112527a53b0f7ff87655c66':
  Don't wait forever if there are no commands to execute.
 2012-01-27 10:10:27 -08:00
Stephen Hines
cee905be48 Merge "Don't wait forever if there are no commands to execute." 2012-01-27 10:08:18 -08:00
Nick Pelly
fac9b5dcbf am ef78d96b: Merge "Add NdefMessage.getByteLength(), and more minor fixes:" 
* commit 'ef78d96b905f7b55cef5df7f5582a249a685458f':
  Add NdefMessage.getByteLength(), and more minor fixes:
 2012-01-27 10:00:58 -08:00
Nick Pelly
ef78d96b90 Merge "Add NdefMessage.getByteLength(), and more minor fixes:" 2012-01-27 09:59:10 -08:00
Jamie Gennis
ac9e27a540 am 7bea6502: Merge "SurfaceTexture: use fence sync on omap4 & s5pc110" 
* commit '7bea65020872a9945a6938068c4922d33cef5b4e':
  SurfaceTexture: use fence sync on omap4 & s5pc110
 2012-01-27 09:54:38 -08:00
Jamie Gennis
7bea650208 Merge "SurfaceTexture: use fence sync on omap4 & s5pc110" 2012-01-27 09:53:14 -08:00
Glenn Kasten
bc3675e35d am c14639a9: Merge "Use audio_source_t consistently" 
* commit 'c14639a9a1dfda34f828e2a6d774edfe5c3c6919':
  Use audio_source_t consistently
 2012-01-27 09:07:55 -08:00
Glenn Kasten
c14639a9a1 Merge "Use audio_source_t consistently" 2012-01-27 09:06:00 -08:00
Glenn Kasten
d242820dd7 am c1f63ddb: Merge "AudioStreamIn and AudioStreamOut" 
* commit 'c1f63ddba76717db4f42ec04a06a0be12f22b2dc':
  AudioStreamIn and AudioStreamOut
 2012-01-27 07:24:16 -08:00
Glenn Kasten
c1f63ddba7 Merge "AudioStreamIn and AudioStreamOut" 2012-01-27 07:22:30 -08:00
Glenn Kasten
4eb44f6928 am 6562dadf: Merge "Declare methods in binder opcode order" 
* commit '6562dadf3c9c97e14b2cd264d08eaae39c9e6d0c':
  Declare methods in binder opcode order
 2012-01-27 07:21:49 -08:00
Glenn Kasten
805d9280ee am 591993f1: Merge "Use enum effect_state consistently" 
* commit '591993f162d0dbf7f6ce0e33a5f8f1bb687e91ce':
  Use enum effect_state consistently
 2012-01-27 07:21:46 -08:00
Glenn Kasten
08f76df810 am 86012869: Merge "Use enum track_state consistently" 
* commit '86012869b8a99e43158f9fe6488b5928a034b03b':
  Use enum track_state consistently
 2012-01-27 07:21:43 -08:00
Glenn Kasten
6562dadf3c Merge "Declare methods in binder opcode order" 2012-01-27 07:19:53 -08:00
Glenn Kasten
416d971625 am 43f4dd4f: Merge "Use enum mixer_state consistently" 
* commit '43f4dd4fa19bf3808f9fddc8a678a0fc935173bb':
  Use enum mixer_state consistently
 2012-01-27 07:19:20 -08:00
Glenn Kasten
591993f162 Merge "Use enum effect_state consistently" 2012-01-27 07:19:10 -08:00
Glenn Kasten
86012869b8 Merge "Use enum track_state consistently" 2012-01-27 07:18:23 -08:00