45779 Commits

Author SHA1 Message Date
Irfan Sheriff
17f49e4f91 am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'b0e5326d8cc661448a7ff611d02d439d4a328a3d':
  DO NOT MERGE No backup of country and sleep policy
2011-02-23 14:41:01 -08:00
Irfan Sheriff
b0e5326d8c am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
  DO NOT MERGE No backup of country and sleep policy
2011-02-23 14:38:10 -08:00
Irfan Sheriff
a46a5cba27 Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 2011-02-23 14:35:20 -08:00
Scott Main
eaf997258d am 63a4f9f5: am c516c771: docs: fix md5 sums
* commit '63a4f9f5e66e5fa38ed798c8cbcc44f623e42ec0':
  docs: fix md5 sums
2011-02-23 14:19:48 -08:00
Scott Main
63a4f9f5e6 am c516c771: docs: fix md5 sums
* commit 'c516c7714d9cdc996053fd2a130015cbde978242':
  docs: fix md5 sums
2011-02-23 14:17:30 -08:00
Scott Main
c516c7714d docs: fix md5 sums
Change-Id: Ie1cb77cf54bd17d2aa8228f73158e7589a7aebaa
2011-02-23 14:13:50 -08:00
Gloria Wang
daabf8b5ee Merge "To collect the total usage time of encoders in the media recorder" 2011-02-23 14:12:33 -08:00
Irfan Sheriff
5e7e5ec038 Remove backup of sleep policy setting
Remove backup and restore of sleep policy settings

Change-Id: I87821efcaca72e12d32fdeedd8349971d85bff2b
2011-02-23 14:11:11 -08:00
Eric Hassold
d9896edfa3 Merge "Correctly handle translucency of device-specific pixel formats" 2011-02-23 14:10:04 -08:00
Jamie Gennis
acf33974b3 Expand on the SurfaceTexture API docs.
This change adds additional documentation explaining how a
SurfaceTexture should be used in OpenGL ES.  It describes some of the
limitations of using the GL_TEXTURE_EXTERNAL_OES texture target.

Change-Id: I9d3446a012376166b6c598b827a0aa0e9585d00f
2011-02-23 13:58:44 -08:00
Alon Albert
9add122296 DO NOT MERGE - Increasing timeout to 60 sec
This was already done in HC branch in this CL:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1
This is also related to bug http://b/issue?id=3402863
I first considered increasing the timeout specificaly for our GData client
but when I saw we already accepted a CL for HC that did this at a lower level, I decided
to do that instead.

Bug: 3402863
Change-Id: I7ef2968ecbab3cc0d698a408f2c643c83d333e2f
2011-02-23 13:55:11 -08:00
Irfan Sheriff
ae388dac6d DO NOT MERGE No backup of country and sleep policy
Remove country code and sleep policy setting back up as it
is a device specific setting

Bug: 3481068
Change-Id: Ifc824c1cd3c3706f8cdaf09b06a05a0c94243acb
2011-02-23 13:51:52 -08:00
Jamie Gennis
1beb480552 am 20bfbd95: am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit '20bfbd9544dcb36f967c93a63842ecea92e82f22':
  egl: fixes for object refcounts
2011-02-23 13:37:34 -08:00
Jamie Gennis
20bfbd9544 am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit '76d0c763f008d19791e13ebabe9ec83958354bc5':
  egl: fixes for object refcounts
2011-02-23 13:31:12 -08:00
Gloria Wang
62e05a6159 To collect the total usage time of encoders in the media recorder
Change-Id: I94c9c94dec6bd714a3ebf96b4465b94f069e55b8
2011-02-23 13:20:21 -08:00
Xia Wang
fb2f199292 Merge "Remove long sleep time in WifiApStress test as it causes the test to run for a long time." 2011-02-23 13:19:24 -08:00
Mike Lockwood
188d00b07e UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts
These extras are also accessable via the UsbDevice and UsbAccessory classes,
which are also included as extras.
Since you can't filter Intents based on extras there is no point in duplicating
this information as separate extras.

Change-Id: I4c8d1e70d66023a1800b3f8f06118898da6b37af
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-23 13:14:33 -08:00
Jamie Gennis
76d0c763f0 am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit 'fa238f033203f8e722b060af3f0095762b134f37':
  egl: fixes for object refcounts
2011-02-23 12:46:57 -08:00
Jamie Gennis
fa238f0332 Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:30:55 -08:00
Xavier Ducrohet
c6083f2c9e LayoutLib: misc fixes.
- implement some Paint methods that are needed for 2.x
- fix the phone system bar to display the icons on the right.

Change-Id: I3a938b14ec9a449dbc23a33303a3c8405a5369a8
2011-02-23 12:00:42 -08:00
Xavier Ducrohet
cc4977d0fd LayoutLib: Hold onto delegate references.
When an object is given a delegate to hold onto, keep
the reference to the delegate instead of its native integer.

Also change the way the finalizer works by not explicitely deleting
the delegate. Instead we want the delegate to be deleted when
nothing holds a reference to it. To do this, instead of using
a regular SparseArray, we use a SparseArray of WeakReferences.
Because the main Java object that "owns" the delegate does not
actually holds a reference to the delegate, we fake this by
having the delegate manager hold a reference to delegates for
the main object. This is added/removed as the object is created
and the native finalized is called.

This makes layoutlib behave more like the JNI code where the native
objects are reference counted, and where the Java object can be
deleted but the delegate it owns is kept around (usually because
another type of delegates hold a reference on it.)

To properly handle the WeakReferences, we need to be able to
regularly clear the SparseArray of WeakReference that were
referencing objects that have been GC'ed.
Since the SparseArray is regularly being compacted (actually only
when items are removed), we use a custom SparseWeakArray (started
as a straight copy of SparseArray) that handles the WeakReference
and takes care of compacting the array by removing deleted indices
and WeakReference that returns null. Since our specific use case
doesn't call actually delete() or remove(), the compacting
only happens when the array needs to be resized.

Change-Id: Iacc5c1ff5b21732b8816fda87eb090da12d034e0
2011-02-23 12:00:41 -08:00
Xavier Ducrohet
8cb6fc184d LayoutLib: Import of SparseArray as SparseWeakArray.
This is a straight copy for easy review of the customization.

Change-Id: I351ec570c3e7a025561939ab05c1ae7eded30b38
2011-02-23 12:00:41 -08:00
Xia Wang
8d2f78898e Remove long sleep time in WifiApStress test
as it causes the test to run for a long time.

Change-Id: I82dd042866f9e9f4637a5c3cc553334abe769260
2011-02-23 11:39:14 -08:00
Scott Main
e86c12c9e4 am 02be2f1d: am 2788e4f9: docs: fix some typos
* commit '02be2f1d874078f227af34fcac7863eca1f35653':
  docs: fix some typos
2011-02-23 11:27:12 -08:00
Scott Main
02be2f1d87 am 2788e4f9: docs: fix some typos
* commit '2788e4f96a3f210192145a340a1d072c70c7bc4f':
  docs: fix some typos
2011-02-23 11:24:42 -08:00
Romain Guy
39c512b623 Don't swap bottom left and bottom right corner radii.
Change-Id: If57b6627f67998edc384de15e3d970f8edf18211
2011-02-23 11:21:39 -08:00
Romain Guy
a6ec8ca641 Merge "Don't swap bottom left and bottom right corner radii." 2011-02-23 11:20:34 -08:00
Leon Scroggins
91ebba38ee Merge "New flag to open intent in a new tab." 2011-02-23 11:20:05 -08:00
Scott Main
d11ee90b6e docs: fix sensorevent code snippets
bug: 3480932

Change-Id: Id97ca4e0edfb92eaac0f2996bc5e91d757644afb
2011-02-23 10:57:23 -08:00
Scott Main
2788e4f96a docs: fix some typos
Change-Id: I2dc9855f8fe87234d4337351e8bac6c382fb74d2
2011-02-23 10:54:31 -08:00
Irfan Sheriff
74ff3d23f9 DO NOT MERGE Add support for background scanning
Background scanning (preferred network offload) allows us the
host to sleep while the dongle monitors the presence of any
preferred networks. This allows us for significant power savings
since the system does not have to wake up often to initiate
a scan

Bug: 3453021
Change-Id: I73dcf4e1c9ab4de280c40b6df6147a74ac003123
2011-02-23 10:49:36 -08:00
Irfan Sheriff
563db5343f Merge "Add support for background scanning" 2011-02-23 10:41:12 -08:00
James Dong
afc671fc5e Merge "Application-managed callback buffer support for raw image" 2011-02-23 10:38:21 -08:00
Santosh Madhava
bba9529d79 Merge "Cleanup for issue 3471160 : video editor calls System.gc" 2011-02-23 09:59:07 -08:00
Gloria Wang
87e639bc15 Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data" 2011-02-23 09:58:33 -08:00
Daniel Sandler
3a2fdedf69 Remove commented cruft, TODOs, and dead code.
Change-Id: I86c953941fe24655f52177474ef39b7f92aa53fa
2011-02-23 11:23:04 -05:00
Daniel Sandler
282ff9ae3f Fix issues with DND display in status bar.
Bug: 3478116
Bug: 3480339
Change-Id: I513f0c2696dc3fe5aa3a6f071f1e4793f9f9645c
2011-02-23 11:05:37 -05:00
Leon Scroggins
af5b406ad6 New flag to open intent in a new tab.
Bug:3405773

Change-Id: I363bfbfee90e98cd1e6a57452e599a79637a8555
2011-02-23 10:46:35 -05:00
Daniel Sandler
ad788884de Merge "Rotation lock fix for sensor{Landscape,Portrait} activities." 2011-02-23 06:43:16 -08:00
Daniel Sandler
70564141ce Merge "Minor cleanups to Notification docs." 2011-02-23 06:43:12 -08:00
Daniel Sandler
5e98dbc770 Merge "Documentation: Notification.icon is mandatory." 2011-02-23 06:42:48 -08:00
Bjorn Bringert
ceb1997174 Merge "ActivityManager exposes launch count API." 2011-02-23 02:30:57 -08:00
Gloria Wang
d211f41f76 - Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data

Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
2011-02-22 22:42:05 -08:00
Justin Ho
176b8d01b9 am 57b920bd: am da34ab21: am 9208875e: Updated iconography for network status and adding 4G assets
* commit '57b920bd6160663d2a00ea7d8933fcc4c4fd20d1':
  Updated iconography for network status and adding 4G assets
2011-02-22 21:56:27 -08:00
Alon Albert
5df34ac754 am a0946d63: am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit 'a0946d6399431d3cc86ef06d44695251ab04933b':
  Support quoted parameters
2011-02-22 21:56:23 -08:00
Robert Ly
74f0f0e7eb am 190d4e29: am c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb
* commit '190d4e29f978742b14e196119e977f0f409b6b86':
  doc change: fix missing code ending tag
2011-02-22 21:41:34 -08:00
Scott Main
72881feb6e am d316bffe: am 47928f89: Merge "docs: fix broken links" into honeycomb
* commit 'd316bffeca451db26fa48d26fa7b10bfd65709c4':
  docs: fix broken links
2011-02-22 21:41:29 -08:00
James Dong
9a146d9d65 am d97c598f: am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit 'd97c598ff4d902583f9083960b088b31350d0018':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:41:25 -08:00
Scott Main
8ce7c32eb0 am 1943b8c8: am 0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb
* commit '1943b8c8da5b03fd97ded8549d16c4db5f116a2d':
  docs: update highlights doc to remove preview
2011-02-22 21:41:20 -08:00
Scott Main
9c979a973d am 8bee4125: am 9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
* commit '8bee41254680493e97c58d4eaa77b5cd112db5ba':
  docs: add breadcrumb trails to some docs, mostly manifest docs
2011-02-22 21:41:14 -08:00