46632 Commits

Author SHA1 Message Date
Robert Greenwalt
8c6452dd3c Clean up LTE code change
Promoting RestrictedState so fewer callsites need be technology specific.
Promoting ServiceState change registration code.
bug:3487388

Change-Id: I8764c3e86a376bbf16935668424b7edb699b21d5
2011-03-02 17:03:13 -08:00
Mike Lockwood
1bdeef34ef MtpClient: remove finalize override to avoid multiple calls to unregisterReceiver
BUG: 3497801

Change-Id: I4ed0166efcc509a18361287c5816bc4844089025
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-02 16:59:53 -08:00
Gloria Wang
9b3f1521b5 - To track the usage of all audio output devices
- To track the currently used audio device
- The devices are separated as speaker and other audio devices
- Provide the collected data to battery application through pullBatteryData()

Change-Id: I374c755266b5ac6b1c6c630400f4daf901ea8acc
2011-03-02 16:53:24 -08:00
Jamie Gennis
28a8cb75e8 Merge "Stagefright: Use the ANW min undequeued bufs query." 2011-03-02 16:44:51 -08:00
Gloria Wang
51caf91f02 Merge "To support DRM files without file extension" 2011-03-02 16:26:18 -08:00
Andreas Huber
ce80b0ca33 Merge "Resize internal PES buffers dynamically instead of relying on a fixed maximum size." 2011-03-02 16:22:20 -08:00
Andreas Huber
56e84ba150 Resize internal PES buffers dynamically instead of relying on a fixed maximum size.
Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952
2011-03-02 16:18:33 -08:00
Amith Yamasani
81d860013c Fix a race condition when entering and exiting a preference fragment quickly.
Bug: 3413715

Fragment was going through STARTED/RESUMED/STARTED/CREATED very quickly and
bindPreferences() was a delayed call that happened after mView was nullified.
Removing the MSG_BIND_PREFERENCES when view is destroyed.

Change-Id: Iec43102c004a266c412b993f17e1a8c1699fb0b1
2011-03-02 16:11:31 -08:00
Andreas Huber
00fa3a729c Merge "Allow optional specification of a PTS timestamp when signalling a discontinuity." 2011-03-02 16:11:01 -08:00
Chia-chi Yeh
b2c8628ed3 Merge "RTP: update javadocs." 2011-03-02 16:02:57 -08:00
Chia-chi Yeh
c52f5b2ec5 RTP: update javadocs.
Change-Id: If600df0eb1e6135aed9f3b2eacfb6bc9ed5d78ff
2011-03-03 08:01:01 +08:00
Jeff Brown
192f0b0608 Merge "Fade out the mouse pointer after inactivity or other events." 2011-03-02 15:54:42 -08:00
Romain Guy
058f47e845 Merge "We need to go deeper. Bug #3431907" 2011-03-02 15:48:33 -08:00
Shimeng (Simon) Wang
0a25836486 Merge "Adjust actual scale when zoom density changes." 2011-03-02 15:45:27 -08:00
Romain Guy
84962f2fe6 We need to go deeper.
Bug #3431907

When drawing layers inside a layer, the wrong target FBO would be used.
This would happen for instance with app widgets using a ViewFlipper
in Launcher. The ViewFlipper uses a fade animation that triggers a
call to saveLayerAlpha(), which in turns creates an FBO. If this happened
during a scroll, the ViewFlipper's FBO would be composited back directly
inside FBO 0, i.e. the screen. This properly initializes the snapshots
of hardware layers to use the layer's FBO as the default compositing
target instead of using 0.

This problem did not happen when drawing hardware layers inside
hardware layers because LayerRenderer already takes care of figuring
out the FBO it needs to composite into. The bug would occur only
with layers generated with saveLayer() and its saveLayerAlpha()
variation.

Layers inside hardware layers insider layers inside hardware layers
now work properly.

Change-Id: Ibe852301087f3d414ad8a18436eebc81f8ac66f5
2011-03-02 15:43:44 -08:00
Mike Lockwood
b13581a9da am 1110748b: DO NOT MERGE: USB accessory support library
* commit '1110748b2df664f9c5066819c1f0616eae3394a7':
  DO NOT MERGE: USB accessory support library
2011-03-02 15:38:55 -08:00
Andreas Huber
669ad13de9 Allow optional specification of a PTS timestamp when signalling a discontinuity.
If present, rendering will be suppressed until reaching the timestamp.

Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19
related-to-bug: 3489454
2011-03-02 15:38:32 -08:00
Alex Sakhartchouk
98e88ca2dc Merge "Fixing element count bug in renderscript." 2011-03-02 15:38:10 -08:00
Jeff Brown
05dc66ada6 Fade out the mouse pointer after inactivity or other events.
Fades out the mouse pointer:
- after 15 seconds of inactivity normally
- after 3 seconds of inactivity in lights out mode
- after a non-modifier key down
- after a touch down

Extended the native Looper to support enqueuing time delayed
messages.  This is used by the PointerController to control
pointer fade timing.

Change-Id: I87792fea7dbe2d9376c78cf354fe3189a484d9da
2011-03-02 15:37:57 -08:00
Irfan Sheriff
04e04fe333 Merge "fix network disconnection handling" 2011-03-02 15:36:10 -08:00
Jason Chen
b85bb89a13 am 166055b5: (-s ours) am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb
* commit '166055b529987554644dc47cb5b29ce33a1ab5d1':
  Bugfixes in StaticLayout. DO NOT MERGE.
2011-03-02 15:33:00 -08:00
Jason Chen
e146592c7b am a6883539: (-s ours) am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb
* commit 'a688353928042ccf9620477476d813c9aceed9e2':
  DO NOT MERGE Cherry-pick of cd59febcea2 from master
2011-03-02 15:32:57 -08:00
Svetoslav Ganov
7fb34b29c6 Merge "Force close in WebView." 2011-03-02 15:24:58 -08:00
Mike Lockwood
1110748b2d DO NOT MERGE: USB accessory support library
This provides a mechanism for developing applications to work with
USB accessories in versions of android prior to the introduction
of the android.hardware.UsbManager APIs.

Applications should link against the com.android.future.usb.accessory
library to use this support.

Change-Id: I0b61e20b63eec42c506f0895a0c9a439bdfdf7f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-02 15:23:41 -08:00
Eric Laurent
1254169260 Merge "Fix issue 3388775." 2011-03-02 15:19:38 -08:00
Mike Lockwood
7866be2b76 am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
  DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 15:16:32 -08:00
Romain Guy
40a787f89a Properly initialize FBO textures for linear filtering.
Change-Id: I67fc4fd760483ef85809be8d6e608cf4f469650f
2011-03-02 15:15:42 -08:00
Romain Guy
a91320e364 Merge "Properly initialize FBO textures for linear filtering." 2011-03-02 15:14:52 -08:00
Svetoslav Ganov
fa44314d3a Force close in WebView.
bug:3504589

WebView#removeJavascriptInterface was not performing check if
a mWebViewCore instance is present. Added such a check.

Change-Id: I7f6dfe51a08f23dddf2fc94df635fdfa68e9a7cf
2011-03-02 14:54:07 -08:00
Irfan Sheriff
9b3710b253 fix network disconnection handling
We should avoid network id set unless the access point is associating.
Also, we should reset network connection state before sending
out network change broadcast.

Finally, we should reset connect mode settings when we disconnect from
an access point

Bug: 3424635
Change-Id: I41db5399810218abd6a77155166db5a9b1dbd22c
2011-03-02 14:45:42 -08:00
Adam Powell
e43111fad3 Merge "Fix bug 3502257 - overscroll effect api" 2011-03-02 14:41:35 -08:00
Adam Powell
07d6f7bd75 Fix bug 3502257 - overscroll effect api
Change-Id: I3bf8bb653e96151c51fb94b4571a72b210615e62
2011-03-02 14:27:30 -08:00
Shimeng (Simon) Wang
9cedbcfdf5 Adjust actual scale when zoom density changes.
Also some fine tuning of zoom scales.
1. Since overview scale will be used to determine min zoom scale, its own
computation shall be free of min zoom scale.
2. make sure mMaxZoomScale is at lease mMinZoomScale.
3. Use default scale in case of non-overview mode, since it reflects the
current zoom density.

issue: 3494868
Change-Id: I4297878b820e437b706bb7e0f143336ff1b39f82
2011-03-02 14:26:36 -08:00
Amith Yamasani
f867706180 am 0e99d3bf: am df33b8c5: Merge "Check for NTP time as soon as WIFI is connected." into honeycomb
* commit '0e99d3bfab99254cc187de127a7a4767f165cde8':
  Check for NTP time as soon as WIFI is connected.
2011-03-02 14:20:36 -08:00
Mike Lockwood
403af5c688 Merge "Combine the USB accessory support library with the platform feature" 2011-03-02 14:19:38 -08:00
Romain Guy
4677c5118c Merge "Fix problem with glyph cache and textScaleX property" 2011-03-02 14:04:47 -08:00
Chet Haase
8668f8a633 Fix problem with glyph cache and textScaleX property
Glyphs drawn with paints that had different textScaleX values were not
being recognized as different, so the glyph cache was being used regardless
of different scaleX values. This change adds the scaleX attribute to the native
Font object to allow the cache to distinguish between this difference and cache
accordingly.

Change-Id: I5d8fc26d47460b27dc8e373a473d46b2f1b8dc30
2011-03-02 14:02:19 -08:00
James Dong
d08f27ee5b Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits" 2011-03-02 14:00:56 -08:00
Mike Lockwood
b547fc297f Combine the USB accessory support library with the platform feature
Also renamed the support library to com.android.future.usb.accessory.jar

Change-Id: Id6226991ce73f75dfedc497adf1c25bffb670243
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-02 13:59:56 -08:00
Eric Fischer
190586b723 Import revised translations. DO NOT MERGE
Change-Id: I2468a95f482f8839158250901d9b52ce9d8e41ad
2011-03-02 13:59:44 -08:00
Mathias Agopian
971ec7a65b Merge changes I9a202210,If26ef8be
* changes:
  fix YV12 documentation
  reformat file, which contained tabs instead of spaces
2011-03-02 13:53:34 -08:00
Mathias Agopian
58a7775d3e fix YV12 documentation
Change-Id: I9a2022101930721a3b3bacc95b02ca21d05f21bb
2011-03-02 13:51:21 -08:00
Fabrice Di Meglio
d313c665e6 Add TextLayout Cache
- use GenerationCache for caching
- move GenerationCache.h from libs/hwui/utils to include/utils
- add #define for cache activation / deactivation

Change-Id: Ifaf519f0b5e33b087a453e4aa6430162d8438f20
2011-03-02 13:29:20 -08:00
Eric Fischer
ded35fcf62 am f6d1d87d: (-s ours) am 86b7a597: Import revised translations. DO NOT MERGE
* commit 'f6d1d87df5a8b85c5129aa952f7652eaedd92645':
  Import revised translations.  DO NOT MERGE
2011-03-02 12:53:58 -08:00
Costin Manolache
1b4c6d57fe am c039bb5d: (-s ours) am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
* commit 'c039bb5d1ee13660142595bf21b4ac1d1ae129a5':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-02 12:53:37 -08:00
Dianne Hackborn
039e634f61 am 4b8c9b74: am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."
* commit '4b8c9b740528301d3ca60fe3b4b861fcd85ceb0a':
  Fix leak when keylock is recreated.
2011-03-02 12:52:56 -08:00
Jaikumar Ganesh
960f24c852 am 998a5617: am 516393fa: am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '998a5617d5c49c998cf6d102e8d03cbf96f09e51':
  Phone crash when old callback func is woken up when enabling BT.
2011-03-02 12:52:48 -08:00
Daniel Sandler
f08c117f09 Merge "resolved conflicts for merge of 49853dc1 to master" 2011-03-02 12:34:00 -08:00
Alex Sakhartchouk
9ea30a69d5 Fixing element count bug in renderscript.
Change-Id: I0e795561db00e647d6dd5a9de7d25baf626d01a6
2011-03-02 12:33:50 -08:00
Gloria Wang
289401b756 To support DRM files without file extension
Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
2011-03-02 12:33:00 -08:00