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

13357 Commits

Author SHA1 Message Date
Brad Fitzpatrick
996f41da3c am 2d5b11ab: am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 
* commit '2d5b11aba0fec21e1ce3f358eb0d280b62704899':
  Fix StrictMode javadoc copy/paste error.
 2010-12-13 16:30:17 -08:00
Nick Kralevich
b019ef6158 am 30ad1e57: am 9dbef975: Merge "Avoid leaking sockets." into gingerbread 
* commit '30ad1e576a445b8ffec12ef148f5d7253ebb6ef4':
  Avoid leaking sockets.
 2010-12-13 16:30:10 -08:00
Dianne Hackborn
f25eb95b4c Merge "resolved conflicts for merge of 78e9f4cb to master" 2010-12-13 16:28:01 -08:00
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
Brad Fitzpatrick
0927c90265 Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 2010-12-13 15:25:09 -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
Romain Guy
c0734f6c8d Merge "Improve error detection in HardwareRenderer.draw(). Bug #3280872" 2010-12-13 14:43:41 -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
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
Brad Fitzpatrick
320274c5f1 Fix StrictMode javadoc copy/paste error. 
Change-Id: Idd49111f0a1af6f331cffa0972191b2d4e25a385
 2010-12-13 14:07:39 -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
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
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
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
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
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
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
Adam Powell
e0893a8555 Merge "Smooth out gesture zooming in WebViews." 2010-12-13 10:47:07 -08:00
Kristian Monsen
7400be47b7 Cleanup of private browsing files are now done in webkit 
Bug 3243891

Change-Id: I51e63a96bf1c95cd8e675a3d94a4aa210418e216
 2010-12-13 17:51:20 +00:00
Patrick Scott
d2f44b7a32 Merge "Suppress scrollbars during layer fling." 2010-12-13 09:30:27 -08:00
Martijn Coenen
6c2471649b am e3f6336b: Fixed API for active NDEF reading and NDEF formatting. 
* commit 'e3f6336bcffc250da90ec864bccfa73ad1d016b9':
  Fixed API for active NDEF reading and NDEF formatting.
 2010-12-13 08:14:01 -08:00
Martijn Coenen
e3f6336bcf Fixed API for active NDEF reading and NDEF formatting. 
- Added getNdefCached() to return the message read at discovery time.
- Fixed format() to check ndef before doing the write:
  libnfc actually requires a checkNdef to be done before writing.

Change-Id: I9b3108299c05539bdef92dd74f62f911fb5a16bf
 2010-12-13 09:58:58 -06:00
Iain Merrick
0f868ca036 Disable CacheManager when using the Chrome HTTP stack. 
Currently, cacheDisabled() reports false, but no files are ever
added to the cache. This CL makes the framework more honest and
reports that the cache is disabled.

BUG=3270236

Change-Id: I13c0291ac295d965f71f1e70dbdebc74b95ddce0
 2010-12-13 14:28:56 +00:00
Iain Merrick
d1281286f2 Merge "Move useChromiumHttpStack() from CookieManager to JniUtil." 2010-12-13 06:22:49 -08:00
Patrick Scott
5b87e296c5 Suppress scrollbars during layer fling. 
Change-Id: Ia6bc1f48e464212d5b9cebef27e4527b0bc93713
 2010-12-13 09:20:32 -05:00
Leon Scroggins
c5ab8b331d Merge "Use drawLines to draw the outline of the WebTextView." 2010-12-13 05:56:54 -08:00
Jeff Hamilton
80c78a896f am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup. 
* commit '641dd62155fd2eeddd93b2036154b13c05b70ba2':
  First pass at advanced NFC tag dispatching APIs and other cleanup.
 2010-12-11 20:58:38 -08:00
Adam Powell
63814df667 Smooth out gesture zooming in WebViews. 
Change-Id: I42c1182f82af3ed16cd23efc056d7c9c34e32940
 2010-12-11 16:49:05 -08:00
Adam Powell
45f1e08c34 Fix bug 3259354 - Handle ActionBar backgrounds better for interacting 
with action modes.

Tweak ActionBar/mode transition animation to look better with a
variety of action bar styles.

Fix bug 3273773 - ActionBar disappearing while displaying
popupwindow. Some SurfaceFlinger optimizations require a relayout to
recalculate the bounds of overlaid views.

Fix bug 3266010 - Cancel animations properly when switching between
modes.

Change-Id: Ic431176b11115a2211bd0a46d09c8998aefe58d6
 2010-12-11 16:25:13 -08:00
Wink Saville
086c0611d3 Fix build. 
This change, I80dbccebea11544595935077463ad7737c3392e9, broke the build
I undeprecated two old OverScroller constructors and hid the new one.

Change-Id: I257ebbc6bb432c6487d63ff03725146dd225a8e2
 2010-12-11 09:01:31 -08:00
Jeff Hamilton
641dd62155 First pass at advanced NFC tag dispatching APIs and other cleanup. 
Change-Id: I022fcd481274a2f68d93218026e77551cfae8cae
 2010-12-10 22:48:16 -06:00
Martijn Coenen
41e74b991b am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect. 
* commit 'b79173f6602359d00a1a89f4d6505a44d461d796':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
 2010-12-10 20:40:40 -08:00