61562 Commits

Author SHA1 Message Date
Eric Laurent
20398fac99 Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 2011-11-23 12:31: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
eaeb4f4e3c Merge "Fix some policy-base routing issues." into ics-mr1 2011-11-23 11:25:39 -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
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
1889bb49a4 Reconcile with ics-mr0-release
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
2011-11-22 15:24:04 -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
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
eff6ed0fee Ignore e36657e5
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
2011-11-22 13:15:31 -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
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
7257a32b9a Merge "HTML5 Video runs into super full screen mode" into ics-mr1 2011-11-22 08:54:59 -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
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
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
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
02740dc49d Merge "Fix log spamming during time lapse video recording" into ics-mr1 2011-11-21 20:28:27 -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
e7005ec958 Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 2011-11-21 18:10:52 -08:00
Michael Chan
20bfe4e68d Update description of account_type
Change-Id: Id929b3a75f86aa79423a0fe0520204ac88502f5b
2011-11-21 18:05:04 -08:00
Mathias Agopian
07a2d83190 Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1 2011-11-21 17:57:31 -08:00
Mathias Agopian
8646cd42df Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 2011-11-21 17:57:20 -08:00
Romain Guy
8cd39e3a10 Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 2011-11-21 17:57:05 -08:00
Adam Powell
fb0784da5f Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 2011-11-21 17:34:57 -08:00
Romain Guy
d0609e41ab Ensure we have an EGL context when building layers
Bug #5638421

This bug was introduced by the recent changes that force more frequent
flushes of the GL renderer.

Change-Id: I55dd4ace6ba1e70ab41927150d6c60c37d7fb196
2011-11-21 17:21:15 -08:00
Mangesh Ghiware
31f263db65 Update zoom (aka display) density from WebView thread.
Fixes bug 5639675.

Change-Id: I982ca0787f5c050c5d1a288cd8751299ee351214
2011-11-21 17:19:31 -08:00
Adam Powell
05c8277f34 Fix bug 5521467 - Monkeys and ActionBar custom tab views
Remove custom tab views from old parents if applicable.

Change-Id: I7892f0f271e91a4fc9e26694557e82b81f3fd31a
2011-11-21 17:14:56 -08:00
Teng-Hui Zhu
f45aa7da2b HTML5 Video runs into super full screen mode
bug:5569146

Browser change
https://android-git.corp.google.com/g/#/c/151035/

Change-Id: Ib8449a670caf4aa2b540a170ed5e9f6adea2b12e
2011-11-21 16:56:08 -08:00
Amith Yamasani
45f06460e9 Fix an NPE on overflow in BatteryStats history.
When the battery stats buffer hits 128KB, it hits a code path
that causes an NPE. This can happen depending on usage and charging
patterns and manifest in bad ways, such as failure to boot up
or random crashes, or refusing to go to sleep.

Bug: 5645407
Change-Id: I21d5d189431f776f25bcb7d598c86e598ad8cb17
2011-11-21 16:08:34 -08:00
Nick Pelly
043a8b149d Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:40 -08:00
Jamie Gennis
b8d20d028c Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 2011-11-21 15:54:54 -08:00
Jamie Gennis
53cf20202a Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* changes:
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
2011-11-21 15:54:40 -08:00
Eric Fischer
68f0d47e8e Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:29:06 -08:00
Eric Fischer
bf1b9778ce Import revised translations. DO NOT MERGE
Change-Id: I4313e0fffeb72b5a78b49770932ad983cfb05f8b
2011-11-21 15:23:51 -08:00
Chia-chi Yeh
bfd85f9aca Merge "SIP: turn off verbose logs." into ics-mr1 2011-11-21 15:19:35 -08:00
Romain Guy
421458aad7 Draw in the correct FBO after invoking a GL functor
Bug #5650514

After invoking a GL functor, libhwui restores a few OpenGL states
including the current FBO. The renderer was however making the
wrong assumption that the FBO to restore to was the base layer
instead of the FBO associated with the current canvas state.

Change-Id: Ie565500832ebffd673f6a43b83422d6cc05470a0
2011-11-21 15:14:37 -08:00
Nick Pelly
a5cb9f4217 Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I09a81a896ff3cceb5a8de331d3399921b870932a
2011-11-21 14:55:29 -08:00
Jamie Gennis
caa4482a68 SurfaceTexture: fix a couple tests
This change fixes some robustness issues with the
EglDestroySurfaceUnrefsBuffers and
EglDestroySurfaceAfterAbandonUnrefsBuffers tests.  The tests previously
depended upon GL implementation details that should not have been relied
upon.

Change-Id: I37fd43b56568efe1dbe69d85e892be8a1cf44d20
2011-11-21 14:38:15 -08:00
Jamie Gennis
87f3265bb0 EGL: default to swap interval 1
This change explicitly sets swap interval 1 on the window when an
EGLSurface is created to render to it.

Change-Id: I91eb29dbee3ae4a55076b921f084d503fbe94e03
2011-11-21 14:37:29 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
2011-11-21 13:30:32 -08:00