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

63810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jeff Brown
6e1c362a21 am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 
* commit 'e7de36e605e0ccf4552c8ee1db40cb9af3227cf4':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
 2011-11-09 19:22:14 +00:00
Jeff Brown
e7de36e605 Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 2011-11-09 11:20:24 -08:00
Peter Ng
02e075ae03 am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1 
* commit '34dd937be1a325fd92d6479822960e4ca13f2420':
  Making quicksettings opaque again
 2011-11-09 19:05:27 +00:00
John Reck
22a073f073 am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1 
* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
  Fix determining find on page overlap
 2011-11-09 19:00:49 +00:00
The Android Open Source Project
97b53f1d22 am eae6c997: Reconcile with ics-mr0-release 
* commit 'eae6c9972d91b9af58c3bf7ba0235c0a3e95c408':
 2011-11-09 19:00:45 +00:00
Jean-Michel Trivi
2b9d17aebd am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1 
* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
  Bug 5585323 New system permission for media decode
 2011-11-09 19:00:39 +00:00
David Brown
ca068a517b am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0 
* commit 'b6b44cef94a38b6f403b43f55d77d3602de18a3c':
  Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
 2011-11-09 19:00:11 +00:00
Glenn Kasten
a6e1ceefc6 am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 19:00:05 +00:00
Jake Hamby
0457e7ed94 am 9c5c97f6: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit '9c5c97f61818f4d20079616a98d62f888f07d285':
  Fix exception when sending multi-page SMS with Turkish characters.
 2011-11-09 19:00:02 +00:00
Eric Laurent
4378e56b35 am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 
* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
  Fix regression for SoundPool playback
 2011-11-09 18:59:51 +00:00
Brian Colonna
830228ef8d am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit '09a56563cea260f12b5606837f5b01420b920170':
  Fix 5514230: preventing null window token from occurring
 2011-11-09 18:59:50 +00:00
Gilles Debunne
4eddb9356a am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1 
* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
  Bug 5575396: close spell session on language change
 2011-11-09 18:59:45 +00:00
Jeff Sharkey
ba83524338 am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1 
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
  Bootstrap stats before registering listeners.
 2011-11-09 18:59:40 +00:00
Jeff Sharkey
3c865c0a51 am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.
 2011-11-09 18:59:38 +00:00
Jeff Sharkey
5d528576ef am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1 
* commit '2048789c64d30b0d3c42c4df7e705f14b7295e10':
  Dispatch alerts through background thread.
 2011-11-09 18:59:37 +00:00
Jeff Sharkey
dcb3b6ad57 am f3882914: Merge "Make policy data enabled flag static." into ics-mr1 
* commit 'f3882914e668501ee1dabd42207ed18348050c14':
  Make policy data enabled flag static.
 2011-11-09 18:59:35 +00:00
Daniel Sandler
cc106d9d87 am da738d63: Merge "Add day of week." into ics-mr1 
* commit 'da738d638cc2fee29d5936f21c6eadbcf173a718':
  Add day of week.
 2011-11-09 18:59:34 +00:00
Mathias Agopian
21e3a16e34 am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1 
* commit 'e4a1bafba351a1b4cea18af3442412de03dd4d89':
  decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
 2011-11-09 18:59:27 +00:00
Dianne Hackborn
0126a4a7f2 am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
  Don't crash if there is no connectivity service.
 2011-11-09 18:59:19 +00:00
Svetoslav Ganov
f32985381c am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 18:59:14 +00:00
Jeff Sharkey
ebf32009ce am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1 
* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
  Avoid inconsistent state when remove fails.
 2011-11-09 18:59:11 +00:00
Jeff Brown
6f551dd14a am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 18:59:01 +00:00
Mathias Agopian
bd35fc2590 am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1 
* commit '393e2c1f7aad37e7851643df22e4810996c26d1f':
  SensorService now always clamps the requested rate
 2011-11-09 18:58:58 +00:00
Peter Ng
34dd937be1 Merge "Making quicksettings opaque again" into ics-mr1 2011-11-09 10:57:23 -08:00
Jason Simmons
efae3d24bd Merge "resolved conflicts for merge of 3af8b88d to ics-aah" into ics-aah 2011-11-09 10:57:19 -08:00
Mike Lockwood
43adbae803 Merge "NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi" into ics-aah 2011-11-09 10:55:26 -08:00
Mike Lockwood
0342a420a4 NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi 
Change-Id: I936fd9a8119ee361ec0afde60f7931c58ffdd524
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-09 10:49:29 -08:00
Jason Simmons
f981686779 resolved conflicts for merge of 3af8b88d to ics-aah 
Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87
 2011-11-09 10:08:21 -08:00
John Reck
36a7f2a9ad Merge "Fix determining find on page overlap" into ics-mr1 2011-11-09 09:28:11 -08:00
The Android Open Source Project
eae6c9972d Reconcile with ics-mr0-release 
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
 2011-11-09 09:00:40 -08:00