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

63845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
4af012a790 am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 
* commit '2375d16378e6f8b7694c5a2cd9e0622e382e6049':
  Send RTSP control connection keep-alive requests
 2011-11-10 16:52:19 +00:00
Andreas Huber
ed894a5860 am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 
* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
  Don't believe the PV decoder's lies...
 2011-11-10 16:52:17 +00:00
Andreas Huber
bb2194c898 am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1 
* commit '7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
  There's no point in trying to continue to decode after an error was signalled.
 2011-11-10 16:49:12 +00:00
Andreas Huber
2375d16378 Merge "Send RTSP control connection keep-alive requests" into ics-mr1 2011-11-10 08:48:44 -08:00
Andreas Huber
b42aea5b4c Merge "Don't believe the PV decoder's lies..." into ics-mr1 2011-11-10 08:48:34 -08:00
Andreas Huber
7c063cf967 Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1 2011-11-10 08:47:25 -08:00
George Mount
047945013e am c60baec7: Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 
* commit 'c60baec7a737d3c3cd596c5c4378a6e12450da3d':
  DO NOT MERGE Set the initial scroll position for RTL.
 2011-11-10 16:33:23 +00:00
George Mount
c60baec7a7 Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 2011-11-10 08:32:18 -08:00
Eric Laurent
43f7bbdfbb am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1 
* commit '7c61fa70a50e15466f807dd194e530bc4fd3a96a':
  Fix problems in tablet silent mode.
 2011-11-10 16:30:51 +00:00
Eric Laurent
7c61fa70a5 Merge "Fix problems in tablet silent mode." into ics-mr1 2011-11-10 08:28:58 -08:00
Wink Saville
bfc53a235d am a092ba56: am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0 
* commit 'a092ba5667e9c055f4d5c83296c8c81471695747':
  [maguro] Update COMPREHENSION-TLV parser in CAT
 2011-11-10 15:24:36 +00:00
Wink Saville
a092ba5667 am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0 
* commit 'e562287c85662457864255028cd4bc3b04f13750':
  [maguro] Update COMPREHENSION-TLV parser in CAT
 2011-11-10 15:22:35 +00:00
Wink Saville
e562287c85 Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0 2011-11-10 07:20:55 -08:00
Gilles Debunne
5a3327d75b am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1 
* commit 'e5504ba1a279fc58eac74bda8d9c5c29cae235a9':
  Visual glitches when starting extracted text
 2011-11-10 08:50:01 +00:00
Gilles Debunne
e5504ba1a2 Merge "Visual glitches when starting extracted text" into ics-mr1 2011-11-10 00:48:10 -08:00
Dave Burke
6981321779 am b5dbf66c: am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0 
* commit 'b5dbf66c7538838eda29b75309234f20720170d1':
  Actually 59 fps DO NOT MERGE
 2011-11-10 08:01:52 +00:00
Dave Burke
b5dbf66c75 am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0 
* commit 'b96194308dc8678e99564f038872061e4881e65a':
  Actually 59 fps DO NOT MERGE
 2011-11-10 07:59:32 +00:00
Dave Burke
b96194308d Merge "Actually 59 fps DO NOT MERGE" into ics-mr0 2011-11-09 23:58:09 -08:00
Dave Burke
5ca88ee679 Actually 59 fps DO NOT MERGE 
Change-Id: Ic70dbba81c054eaaf21f71b10e329ebf1424d4a2
 2011-11-09 23:53:51 -08:00
Dave Burke
ced77f2388 am ab22f862: Merge "Back to 59fps" into ics-mr1 
* commit 'ab22f862a912035ba83591db448806fd81ed74f4':
  Back to 59fps
 2011-11-10 07:50:19 +00:00
Dave Burke
ab22f862a9 Merge "Back to 59fps" into ics-mr1 2011-11-09 23:49:09 -08:00
satok
b199d4fada am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 
* commit '114c4d3843758a2a1ffb32eb2719d65cdee637f8':
  Introduce an API to cancel pending/running spell check tasks
 2011-11-10 05:28:09 +00:00
satok
114c4d3843 Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 2011-11-09 21:26:46 -08:00
Daniel Sandler
922e70f4db am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1 
* commit 'bca520a170f84c8be840e629841d0dc7d7cb273b':
  Use platform assets for brightness scrubber.
 2011-11-10 04:43:01 +00:00
Daniel Sandler
bca520a170 Merge "Use platform assets for brightness scrubber." into ics-mr1 2011-11-09 20:41:03 -08:00
Wink Saville
23a96d6496 am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 
* commit '08b3ffe61182b60ded3bfa599778b6f5495e87db':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
 2011-11-10 03:44:44 +00:00
Wink Saville
08b3ffe611 am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 
* commit '16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
 2011-11-10 03:42:09 +00:00
Wink Saville
16ee60a5ae Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 2011-11-09 19:39:39 -08:00
Wink Saville
6fc3ca7e19 Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes. 
Initially set to 3 minutes this raised the standby current
by 12.5% so changing to 6 minutes.

Bug: 5534004
Change-Id: I602f5fe4de35d0db2dbacf0c615c300c57dd2d0d
 2011-11-09 18:53:08 -08:00
satok
b4aff97c85 Introduce an API to cancel pending/running spell check tasks 
Bug: 5554629

Change-Id: Ifd840ea13976813639a2ee259124a21d9bb56893
 2011-11-10 11:50:45 +09:00
satok
acf8357f30 am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 
* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
  Respect user settings for spell checking language if explicitly set
 2011-11-10 02:44:03 +00:00
satok
34bd596935 Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 2011-11-09 18:42:48 -08:00
Eric Laurent
96a33d1caa Fix problems in tablet silent mode. 
Do not enter silent mode when ALARM stream volume is changed
to 0 by volume down key: Only RING, NOTIFICATION and MUSIC
streams control silent mode.

Report correct volume (0) for NOTIFICATION stream when silent mode
is entered by changing NOTIFICATION stream volume to 0 with
volume down key.

Change-Id: I3e0816dfae40bc127cc30cca02cdca6ec19e30a4
 2011-11-09 18:06:37 -08:00
Dave Burke
b9655847bc Back to 59fps 
Change-Id: I8d89e5e27f1abc5a2e36cb832eb4db2ca83c2cc6
 2011-11-09 17:54:37 -08:00
Wink Saville
f08455451c [maguro] Update COMPREHENSION-TLV parser in CAT 
1. Fix the ClassCastException while handling spec out 'Setup menu'
   -Ghana MTN simcard and JDI simcard sends abnormal 'setup menu'cmd.
   -Those 'setup menu' is spec out.
   -At the end of the proactive cmd,extra bytes '0x00 0x00 0x00 0x00' is
   followed.
   - That cause ClassCastException and phone crash.

Bug: 5574160
Change-Id: Ieafb6c4efd94bb4e2a39a04612a6761c958654bb
Signed-off-by: dujin.cha <dujin.cha@samsung.com>
 2011-11-09 17:31:34 -08:00
Mathias Agopian
ba232d0494 am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE 
* commit '42694dc4a7af4f38e39cb26a852f3f75e730bb05':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
 2011-11-10 00:43:55 +00:00
Mathias Agopian
42694dc4a7 am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE 
* commit '3e458306b0caf4e21294acc58286b24bda08a242':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
 2011-11-10 00:41:43 +00:00
Mathias Agopian
3e458306b0 Set the WM refresh rate to 60 Hz for tuna devices only DO 
NOT MERGE

This approach is TEMPORARY until we can do this properly.

Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f
 2011-11-09 16:01:07 -08:00
George Mount
331493085d DO NOT MERGE Set the initial scroll position for RTL. 
Bug 5268793
 Webkit knows about the correct initial position for web pages.
 On initial show, scroll to the webkit position.

 Cherry-picked from master CL: I2537b84a

 External WebKit CL: I6a91b97f

Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
 2011-11-09 15:37:26 -08:00
Jim Miller
d9147aad5e am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 
* commit '270826a8878b5470d48d93ca3d518ac93860870d':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
 2011-11-09 23:24:07 +00:00
Eric Fischer
c712a671d8 am 6b992090: am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '6b992090f6eb1e14553be22373799258bb401e3d':
  Import revised translations.  DO NOT MERGE
 2011-11-09 23:24:06 +00:00
Jim Miller
270826a887 Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 2011-11-09 15:19:31 -08:00
Eric Fischer
6b992090f6 am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '3124bf64404dbb90cc521abf4c7bf8d438346362':
  Import revised translations.  DO NOT MERGE
 2011-11-09 23:18:10 +00:00
Eric Fischer
3124bf6440 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-09 15:15:42 -08:00
satok
05f2470061 Respect user settings for spell checking language if explicitly set 
Bug: 5554116
Change-Id: I8c16d732af1fe713d30d97dfe829ff16653c7f34
 2011-11-10 07:54:52 +09:00
Robert Ly
c49f5b734e am 69db5695: am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0 
* commit '69db56958fdac41a093cd6cf00cbe200f2885730':
  docs: update samples toc for rs sample
 2011-11-09 21:28:34 +00:00
Robert Ly
69db56958f am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0 
* commit 'bd4bdbec62776b1222b1f202e44f8f127bfb7bab':
  docs: update samples toc for rs sample
 2011-11-09 21:25:45 +00:00
Robert Ly
bd4bdbec62 Merge "docs: update samples toc for rs sample" into ics-mr0 2011-11-09 13:23:34 -08:00
Jamie Gennis
c1c327ed63 am 97ece7a9: Merge "EGL: add deferred saving of the cache" into ics-mr1 
* commit '97ece7a95f76ec724633d4f4764291ea4dc20933':
  EGL: add deferred saving of the cache
 2011-11-09 19:48:30 +00:00
Jamie Gennis
97ece7a95f Merge "EGL: add deferred saving of the cache" into ics-mr1 2011-11-09 11:46:45 -08:00