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

64768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
b16dc690a5 temporarily hardcode Nexus S refresh rate 
Change-Id: Id8465f679b96636041b4b891d0b358c387d456c3
 2011-11-23 14:51:09 -08:00
John Wang
9b1080091c Check watingApns before access it. 
bug:5663125
Change-Id: I66275fafd316f318f9035ac11c16a30fcb32f7c8
 2011-11-23 14:26:38 -08:00
Eric Laurent
e49f706479 am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 
* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
  audioflinger: reduce sleep time to avoid underrun
 2011-11-23 12:32:30 -08:00
Eric Laurent
20398fac99 Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 2011-11-23 12:31:04 -08:00
Michael Chan
4753318b11 am 37ac88f9: Merge "Update description of account_type" into ics-mr1 
* commit '37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
  Update description of account_type
 2011-11-23 12:16:04 -08:00
Michael Chan
37ac88f994 Merge "Update description of account_type" into ics-mr1 2011-11-23 12:12:51 -08:00
Robert Greenwalt
e0c3a2e063 am eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1 
* commit 'eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
  Fix some policy-base routing issues.
 2011-11-23 11:27:04 -08:00
Robert Greenwalt
eaeb4f4e3c Merge "Fix some policy-base routing issues." into ics-mr1 2011-11-23 11:25:39 -08:00
Teng-Hui Zhu
7ae9f3ab55 WebView animation support 
Fix the jumping issue when double tapping

bug:4982054
Change-Id: Ifb67030a3132fe3820a1fcc8ffc97a1ab474c223
 2011-11-23 10:47:51 -08:00
Irfan Sheriff
c74694d5e1 Fix tethering interaction from wifi 
- Use the right interface for untether

- Wait till tethering service confirms that untether() is successful before
shutting down soft Ap. This helps to make sure interface does not go away
before clean up is done.

Bug: 5659166
Change-Id: Iff9d4a67ff40664c2114e766590d6a83b7739738
 2011-11-23 10:05:05 -08:00
Robert Greenwalt
e83d181606 Fix some policy-base routing issues. 
Secondary nets sometimes come up with no routes, but parsing errors end up with null
routes getting added.  Trim that away.  Also added some dumpstate logging of the secondary
route tables and rules.

bug:5615697
Change-Id: I94c9d888bab958df44891b9117236436e046cc7f
 2011-11-23 09:36:16 -08:00
Daniel Sandler
7d46c613f6 Quick fix for bug 5646217 blocking automation tests 
The screen saver knows to avoid running when applications
are holding wake locks via window flags, but other wake
locks are invisible to the window manager and therefore to
the screen saver activation code.

The correct thing to do is move the screen saver to the
power manager to give it access to all wakelock information.
In the meantime, this fix checks for the user's
STAY_ON_WHILE_PLUGGED_IN setting and disables the screen
saver in this case.

Bug: 5646217
Change-Id: Ia2286a8c3745267871901f7a0b7df94ec344a456
 2011-11-23 09:03:51 -05:00
Eric Rowe
fca8e9d919 Fix SCO start stop tests. 
Change-Id: Idf292bc244a494e2ffb11359e83c0d072907ea3b
Bug-id: http://b/5644683
 2011-11-22 19:16:50 -08:00
Eric Laurent
f1f5fc85b0 audioflinger: reduce sleep time to avoid underrun 
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.

Issue 5553055.

Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
 2011-11-22 18:50:29 -08:00
Owen Lin
a8183fb160 am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 
* commit '8bb56180d208b9264e5a56b49fe06b8471ccaced':
  Fix 5654631. It forgot to consider the year in formatDateRange.
 2011-11-22 17:46:35 -08:00
Owen Lin
8bb56180d2 Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 2011-11-22 17:44:52 -08:00
The Android Open Source Project
1a27e5f600 am 1889bb49: Reconcile with ics-mr0-release 
* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
 2011-11-22 15:26:17 -08:00
The Android Open Source Project
1889bb49a4 Reconcile with ics-mr0-release 
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
 2011-11-22 15:24:04 -08:00
The Android Open Source Project
6e67a9f804 am 27239099: Reconcile with ics-mr0-release 
* commit '2723909903b68db016666a13ec897581a8915636':
 2011-11-22 15:16:02 -08:00
The Android Open Source Project
2723909903 Reconcile with ics-mr0-release 
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
 2011-11-22 15:14:10 -08:00
The Android Automerger
9842a34938 merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 14:28:06 -08:00
dujin.cha
b31783b142 am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue 
* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue
 2011-11-22 13:20:21 -08:00
dujin.cha
eabde3d4a9 am fe464a76: [Prime K] Fix gabage character issue 
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
  [Prime K] Fix gabage character issue
 2011-11-22 13:18:27 -08:00
Jean-Baptiste Queru
7c3e4a0fea am eff6ed0f: Ignore e36657e5 
* commit 'eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f':
  Do not merge. Fix a memory leak of a Binder in SpellCheckerService
 2011-11-22 13:18:11 -08:00
Jean-Baptiste Queru
eff6ed0fee Ignore e36657e5 
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
 2011-11-22 13:15:31 -08:00
Romain Guy
6490d01a3b am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 
* commit '303a0695b8fa0b8f0095c437145a28633a7a8d92':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
 2011-11-22 12:34:25 -08:00
Romain Guy
193187afbc am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1 
* commit '26dd54f87c1daaa369576d9abea823c8105bd702':
  Ensure we have an EGL context when building layers Bug #5638421
 2011-11-22 12:34:23 -08:00
Romain Guy
303a0695b8 Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 2011-11-22 12:33:17 -08:00
Romain Guy
26dd54f87c Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1 2011-11-22 12:33:04 -08:00
Amith Yamasani
0d00fa958f am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 
* commit '227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
  Fix an NPE on overflow in BatteryStats history.
 2011-11-22 11:05:01 -08:00
Amith Yamasani
227a64fe23 Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 2011-11-22 11:02:49 -08:00
dujin.cha
fe464a76d8 [Prime K] Fix gabage character issue 
Korean characters show up as gabage characters in Music player.
Reason : MTP service does not set the locale for the MediaScanner
Solution : Set locale when MtpDatabase creates MediaScanner.

Bug ID : 5567433
Signed-off-by: dujin.cha <dujin.cha@samsung.com>

Change-Id: I4bfe5f603c113170d45bd57a8709c21c665e260b
 2011-11-22 10:28:21 -08:00
Teng-Hui Zhu
d437629339 am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1 
* commit '7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
  HTML5 Video runs into super full screen mode
 2011-11-22 08:56:37 -08:00
Teng-Hui Zhu
7257a32b9a Merge "HTML5 Video runs into super full screen mode" into ics-mr1 2011-11-22 08:54:59 -08:00
Andreas Huber
1d72b75006 am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 
* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
  Report a runtime error instead of asserting on malformed avc configuration data.
 2011-11-22 08:41:26 -08:00
Andreas Huber
cb6fbc89c2 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 2011-11-22 08:39:11 -08:00
Daniel Sandler
3d112461d2 am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1 
* commit '631885746868cbf03f89e655a6f4fac96449e8a4':
  Dismiss system windows when screen savers start.
 2011-11-22 07:17:19 -08:00
Daniel Sandler
6318857468 Merge "Dismiss system windows when screen savers start." into ics-mr1 2011-11-22 07:15:29 -08:00
Owen Lin
b193e35ed1 Fix 5654631. It forgot to consider the year in formatDateRange. 
Change-Id: I494e3ecc7a2e7c418ed61930ffd7311338c11783
fix: 5654631
 2011-11-22 15:36:50 +08:00
Mangesh Ghiware
b61dddc8fa am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 
* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
  Update zoom (aka display) density from WebView thread.
 2011-11-21 23:16:14 -08:00
Mangesh Ghiware
8d03007f80 Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 2011-11-21 23:14:05 -08:00
Xia Wang
a4c2caac05 Increase time between wifi stop and wifi start: set to 2 minutes 
http://b/issue?id=5629901

Change on state validation:
  - When network state is broadcast in other network information,
    the test activity will record the state change which cause false
    alarm in the test.

Change-Id: I8bd1e8c04ab97116f3a02ccc5543f34a7e651cda
 2011-11-21 21:22:10 -08:00
Romain Guy
bc1f098594 am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1 
* commit '723218b4f428944bdb11b25d0b30ece56283f696':
  Hide ManagedEGLContext until we are sure this is the correct API.
 2011-11-21 21:20:16 -08:00
Romain Guy
723218b4f4 Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1 2011-11-21 21:18:51 -08:00
James Dong
5662725277 am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 
* commit '02740dc49df86fc94c872454aa9db98737d5e8c8':
  Fix log spamming during time lapse video recording
 2011-11-21 20:30:14 -08:00
James Dong
02740dc49d Merge "Fix log spamming during time lapse video recording" into ics-mr1 2011-11-21 20:28:27 -08:00
Romain Guy
f6286e5e9a am 1766b0e2: Fix the build 
* commit '1766b0e25de5a66f9d0f6e73a2c342272fcadc71':
  Fix the build
 2011-11-21 18:31:35 -08:00
Romain Guy
1766b0e25d Fix the build 
Change-Id: I3814c6c39eda2a4b56902e2044fbb121b4885e5d
 2011-11-21 18:28:49 -08:00
Romain Guy
dccf73a50c Hide ManagedEGLContext until we are sure this is the correct API. 
Change-Id: If54942d342ca8ea348e10231b2aed3e5d3bd701b
 2011-11-21 18:27:21 -08:00
Wu-cheng Li
fcc9f9be1f am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 
* commit 'e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
  Move Camera.Sound to a stand-alone class CameraSound.
 2011-11-21 18:13:16 -08:00