38100 Commits

Author SHA1 Message Date
Brad Fitzpatrick
2d5b11aba0 am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '0927c9026537166cec36b2f9bb8a764ef8a7c606':
  Fix StrictMode javadoc copy/paste error.
2010-12-13 15:27:25 -08:00
James Dong
399623935c Fix an issue where a fixed number of bits per sample is used for seek position calculation.
The patch was from NV.

bug - 3278233

Change-Id: I9bc22b6b0ee6bfa5d4617a8c497f67eb577efca4
2010-12-13 15:26:20 -08:00
Brad Fitzpatrick
0927c90265 Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 2010-12-13 15:25:09 -08:00
Alex Sakhartchouk
271290dc46 Merge "Perf test" 2010-12-13 15:24:20 -08:00
Nick Kralevich
30ad1e576a am 9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
  Avoid leaking sockets.
2010-12-13 15:05:20 -08:00
Nick Kralevich
9dbef975f0 Merge "Avoid leaking sockets." into gingerbread 2010-12-13 15:03:28 -08:00
Dianne Hackborn
ccc7141313 resolved conflicts for merge of 78e9f4cb to master
Change-Id: I1135361e6d66f524c3f349e2bf1f31bd4191c634
2010-12-13 14:55:25 -08:00
Irfan Sheriff
02fb46a297 WPS fixes and refactor
- Allow IP and proxy set up for WPS
- Use string for WPS pin to avoid losing leading zeros
- Add a seperate WPS state machine and WpsConfiguration class

Change-Id: I87f43fff8bba0ae8ff02e5fc495a8bc628a8c8cf
2010-12-13 14:50:51 -08:00
Alex Sakhartchouk
6b5222dd53 Perf test
Change-Id: I5cfc1b6dd438b13091993d4669e10fb2e49aaa06
2010-12-13 14:48:21 -08:00
Romain Guy
b8c0de2c27 Improve error detection in HardwareRenderer.draw().
Bug #3280872

This should avoid crashes before we detect a GL error and we switch over to
software rendering.

Change-Id: Ieb4992576d20014e194aab863a456f09c5e19672
2010-12-13 14:44:36 -08:00
Romain Guy
c0734f6c8d Merge "Improve error detection in HardwareRenderer.draw(). Bug #3280872" 2010-12-13 14:43:41 -08:00
Dianne Hackborn
78e9f4cbae am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
  Fix issue #3154576: battery stats checkin should include UID -> packages+ map
2010-12-13 14:37:09 -08:00
Nick Kralevich
2ed20f8768 Avoid leaking sockets.
When a DNS lookup fails, we end up creating a datagram socket
but never properly close it.  This wastes limited valuable file
descriptors and causes CTS test failures.  Generally, we should
ensure that sockets or files are opened in a try block, and closed
in a finally block.

Bug: 3276283
Change-Id: I3432f3bc061268c7367948230f6edbdfcec55892
2010-12-13 14:32:17 -08:00
Dianne Hackborn
e4a5951925 Fix issue #3154576: battery stats checkin should include UID -> packages+ map
Includes some other small fixes to battery collection and a few
other things.

Output of package info looks like this:

5,0,i,uid,1000,com.android.settings
5,0,i,uid,1000,com.android.providers.subscribedfeeds
5,0,i,uid,1000,com.android.providers.settings
5,0,i,uid,1000,com.android.server.vpn
5,0,i,uid,1000,android
5,0,i,uid,1000,com.android.systemui
5,0,i,uid,1000,com.google.android.backup
5,0,i,uid,1001,com.android.phone
5,0,i,uid,1001,com.android.providers.telephony
5,0,i,uid,1022,com.android.nfc
5,0,i,uid,10021,com.google.android.location
5,0,i,uid,10021,com.google.android.syncadapters.calendar
5,0,i,uid,10021,com.google.android.gsf
5,0,i,uid,10021,com.google.android.syncadapters.contacts
5,0,i,uid,10026,com.android.providers.downloads.ui
5,0,i,uid,10026,com.android.providers.media
5,0,i,uid,10026,com.android.providers.drm
5,0,i,uid,10026,com.android.providers.downloads
5,0,i,uid,10032,com.android.launcher
5,0,i,uid,10039,com.google.android.gm
5,0,i,uid,10041,com.google.android.gallery3d
5,0,i,uid,10049,com.android.providers.calendar

Change-Id: I9e38f254eef146339113ad270f5c6e8b60fb7a1d
2010-12-13 14:31:40 -08:00
Brian Carlstrom
ffdd591a82 Merge "Update API for CopyOnWriteArrayList "synchronized" changes" 2010-12-13 14:30:39 -08:00
Jim Miller
7b33148251 Merge "Fix 3253629: Improve Recents panel animation performance." 2010-12-13 14:28:17 -08:00
Brian Carlstrom
502893cdd3 Update API for CopyOnWriteArrayList "synchronized" changes
Change-Id: Iebedcac1275d46d58b33a43418bcb93fbbcd3a0b
2010-12-13 14:26:36 -08:00
Louis Huemiller
f5a1a0b63b Merge "Hardware Composer Stress Test Enhancements" 2010-12-13 14:17:23 -08:00
Brad Fitzpatrick
320274c5f1 Fix StrictMode javadoc copy/paste error.
Change-Id: Idd49111f0a1af6f331cffa0972191b2d4e25a385
2010-12-13 14:07:39 -08:00
Jaikumar Ganesh
aecb2c5f70 Remove function when Bluetooth is not present in the hardware.
Change-Id: I3892044723402597b7db1f7df683c08804c1fb96
2010-12-13 14:05:30 -08:00
Mike Lockwood
595ca7062e Merge "PowerManager: remove unused import" 2010-12-13 13:54:09 -08:00
Jaikumar Ganesh
faaddc632f Merge "Add direct calls to Bluez to add SDP records." 2010-12-13 13:42:42 -08:00
Mike Lockwood
36e52dce7f PowerManager: remove unused import
Change-Id: I0cfd48bd7ec0af3be7721994ab31d6f00634a4e0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 13:42:28 -08:00
Leon Scroggins
a60f00ffec Merge "Use black text on white background for dropdowns." 2010-12-13 13:24:42 -08:00
Louis Huemiller
406041848f Hardware Composer Stress Test Enhancements
Enhancements include:
  + Change default delay after each set operation
    from 0.1 to 0.0 seconds.  This significantly
    increases the default rate at which operations
    are performed.

  + Make sourceCrop to displayFrame scale
    factor of 1.0 a frequent occurance.

  + Enable use of RGB888 and YV12 graphic formats.

  + Add initCheck() call after creation of a
    GraphicBuffer, to confirm it was created
    without any errors.

Change-Id: I1606dff3924a23bdd5cb27ba302bebb4f200d768
2010-12-13 13:19:13 -08:00
Jean-Baptiste Queru
dd60ee728d am 6d13b146: am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master
* commit '6d13b146e0444f40f45b9fe5812093c5e611b68e':
  Added dropbox broadcast notification
2010-12-13 13:12:36 -08:00
Jean-Baptiste Queru
6d13b146e0 am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master
* commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8':
  Added dropbox broadcast notification
2010-12-13 13:10:23 -08:00
Leon Scroggins
60344deb7c Use black text on white background for dropdowns.
Bug:3249233
Change-Id: I8c400c4ab043409e40a1180d45effd4513d0657c
2010-12-13 16:08:04 -05:00
Jean-Baptiste Queru
e78a000955 resolved conflicts for merge of 4b94c451 to stage-korg-master
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
2010-12-13 13:06:13 -08:00
Brandon Keely
20f9fec020 Merge "Massaging system transitions." 2010-12-13 13:04:00 -08:00
Leon Scroggins
3db6af9237 Merge "Do not loop forever." 2010-12-13 13:02:39 -08:00
Dianne Hackborn
30d7189067 Fix issue #3274841: Orientation change problem with a paused activity
Plus a bunch of debug output improvements.

And some new Intent helpers for dealing with restarting an app.

Change-Id: I50ec56bca6a86c562156b13fe8a6fdf68038a12e
2010-12-13 12:57:02 -08:00
Leon Scroggins
d75e64af99 Do not loop forever.
Bug:3279066
Change-Id: I5222c465af2345f643bfd528d580d32ab9ba328e
2010-12-13 15:48:40 -05:00
Mike Lockwood
5bd7d9347b Merge "MediaScanner: No longer delete playlist files that have no valid entries" 2010-12-13 12:39:28 -08:00
Jean-Baptiste Queru
4b94c451d2 Merge "Added dropbox broadcast notification" 2010-12-13 12:34:48 -08:00
Martijn Coenen
87212c1979 am 6c247164: am e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
* commit '6c2471649b5b1d1d9c19305a43676161823b623a':
  Fixed API for active NDEF reading and NDEF formatting.
2010-12-13 12:31:46 -08:00
Jeff Hamilton
152cce2199 am 80c78a89: am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
* commit '80c78a896f32461513b9750fc2869cd6b2795888':
  First pass at advanced NFC tag dispatching APIs and other cleanup.
2010-12-13 12:31:38 -08:00
Martijn Coenen
c26ba7dd27 am 41e74b99: am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit '41e74b991bc50bfa16ba920e998c76a88aa8ae69':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
2010-12-13 12:31:29 -08:00
Martijn Coenen
4e656372bd am 2019f533: am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit '2019f53396f5b45a307cc4b24123eb19b9a5246f':
  Changed transceive on all technologies to "raw", except for Mifare classes.
2010-12-13 12:31:23 -08:00
Martijn Coenen
8efdf6459e am 25556f66: am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '25556f666934c72ca53ad0f309078e3d4bd29ca9':
  Implemented isWritable() to indicate NDEF capability container r/w state.
2010-12-13 12:31:10 -08:00
Kenny Root
33bc175841 Merge "Introduce NDK API for 64-bit assets" 2010-12-13 12:29:06 -08:00
Nick Pelly
907ecb1dd5 Merge "resolved conflicts for merge of 1d0d1188 to master" 2010-12-13 12:25:22 -08:00
Nick Pelly
d250746716 resolved conflicts for merge of 1d0d1188 to master
Change-Id: I80413d5a54a0284ab6f685c4c6197a2c009ea717
2010-12-13 12:22:34 -08:00
Mike Lockwood
eb46d0601e MediaScanner: No longer delete playlist files that have no valid entries
When copying files from MTP we must keep the file in the database, even
if we cannot find any of the playlist entries (or even if it is not a valid playlist file)

BUG: 3260341

Change-Id: I4b39027ee25ffae6778224cf74830a4b1ca3fecb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 12:10:45 -08:00
Kenny Root
06ea4d65e8 Introduce NDK API for 64-bit assets
Assets were switched to using 64-bit all through the system, so switch
the NDK to using this new API as well.

Change-Id: I2817b11369db3a4dd504b839ef1a3a9780b83533
2010-12-13 12:02:19 -08:00
Jaikumar Ganesh
84690c88f3 Add direct calls to Bluez to add SDP records.
This helps Settings app to enable just the Headset service.

Change-Id: Ia9c39467df1e83d665e377313e16e6c54991f6d6
2010-12-13 11:37:41 -08:00
Xavier Ducrohet
666a5ed981 Merge "LayoutLib: parsed resources were always set as platform res." 2010-12-13 11:35:42 -08:00
Brandon Keely
0fe197ee95 Massaging system transitions.
Change-Id: Ic6233f33ef1ee011274631119022b7adc6432ca2
2010-12-13 11:33:00 -08:00
Adam Powell
14b0a6bc0e Merge "Update bg drawable properly on ActionBars based on earlier changes" 2010-12-13 10:52:04 -08:00
Adam Powell
e8c1e5c02d Update bg drawable properly on ActionBars based on earlier changes
Change-Id: I5e24ffb030d2c29620948114b9015c0c028a133e
2010-12-13 10:49:32 -08:00