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

111153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
938326721d am ae59980c: am 58514937: Merge "Resized thumbnails; async; extend MatrixCursor." into klp-dev 
* commit 'ae59980c24cfaebc0654a01f621b344103b3bcd4':
  Resized thumbnails; async; extend MatrixCursor.
 2013-08-18 13:59:00 -07:00
Jeff Sharkey
ae59980c24 am 58514937: Merge "Resized thumbnails; async; extend MatrixCursor." into klp-dev 
* commit '58514937628dfcf3b2949e4cbc45d5526ecb8019':
  Resized thumbnails; async; extend MatrixCursor.
 2013-08-18 13:55:42 -07:00
Jeff Sharkey
5851493762 Merge "Resized thumbnails; async; extend MatrixCursor." into klp-dev 2013-08-18 20:53:29 +00:00
Matthew Xie
3983280070 am 6b080fb5: am f855a2ff: Merge "Adding support for Absolute Volume" into klp-dev 
* commit '6b080fb5733a09ecf4963dc74493493b64752ce2':
  Adding support for Absolute Volume
 2013-08-18 12:54:21 -07:00
Matthew Xie
6b080fb573 am f855a2ff: Merge "Adding support for Absolute Volume" into klp-dev 
* commit 'f855a2ff01b270c06977f64f4a002f3f1c7769ca':
  Adding support for Absolute Volume
 2013-08-18 12:51:20 -07:00
Matthew Xie
f855a2ff01 Merge "Adding support for Absolute Volume" into klp-dev 2013-08-18 19:46:42 +00:00
Ben Murdoch
0e1ca4c82a am a62e118b: am e265d96e: Merge "Update WebView.postUrl documentation." into klp-dev 
* commit 'a62e118b1a91900dd52f3e3869d3fa1c4d93180c':
  Update WebView.postUrl documentation.
 2013-08-18 08:18:21 -07:00
Ben Murdoch
a62e118b1a am e265d96e: Merge "Update WebView.postUrl documentation." into klp-dev 
* commit 'e265d96e60eb992e5741ac9d88c9b749122012af':
  Update WebView.postUrl documentation.
 2013-08-18 08:15:03 -07:00
Ben Murdoch
e265d96e60 Merge "Update WebView.postUrl documentation." into klp-dev 2013-08-18 15:11:44 +00:00
Jeff Sharkey
9d0843df7e Resized thumbnails; async; extend MatrixCursor. 
When requesting thumbnails, check if their dimensions are larger
than requested, and downscale to avoid memory pressure.  Load them
async and with LruCache.

Extend MatrixCursor so that RowBuilder can offer() columns without
requiring they know the projection map.  This makes it easier to
respond to query() calls, where the remote side controls the
projection map.  Use it to handle custom projections in external
storage backend.

Update date/time formatting to match spec.

Bug: 10333418, 10331689
Change-Id: I7e947a8e8068af8a39b55e6766b3241de4f3fc16
 2013-08-17 19:05:07 -07:00
Alan Viverette
9ceeea7402 am 946199a3: am 77b2a861: Merge "Fix padding resolution" into klp-dev 
* commit '946199a3a846072c1ac40db1a55dec8849da1b86':
  Fix padding resolution
 2013-08-16 19:04:01 -07:00
Alan Viverette
946199a3a8 am 77b2a861: Merge "Fix padding resolution" into klp-dev 
* commit '77b2a86144365ce3dee557b5c444075c0e0a4033':
  Fix padding resolution
 2013-08-16 19:02:18 -07:00
Alan Viverette
77b2a86144 Merge "Fix padding resolution" into klp-dev 2013-08-17 02:00:39 +00:00
Romain Guy
cb39785dd7 am 725617f6: am 83aec80f: Merge "Fix hardware layers lifecycle Bug #10075732" into klp-dev 
* commit '725617f66a07488f8cafda24c517e257e9eb2bc2':
  Fix hardware layers lifecycle Bug #10075732
 2013-08-16 18:47:09 -07:00
Romain Guy
725617f66a am 83aec80f: Merge "Fix hardware layers lifecycle Bug #10075732" into klp-dev 
* commit '83aec80fb49000b2f32268590de5971c055febe9':
  Fix hardware layers lifecycle Bug #10075732
 2013-08-16 18:44:27 -07:00
Romain Guy
83aec80fb4 Merge "Fix hardware layers lifecycle Bug #10075732" into klp-dev 2013-08-17 01:41:28 +00:00
Romain Guy
46bfc48110 Fix hardware layers lifecycle 
Bug #10075732

Hardware layers could survive across EGL terminate events.

Change-Id: Ie8565d55cb29fe6625fa1584d695edfecd37ab5e
 2013-08-16 18:38:29 -07:00
Sascha Haeberling
7cac2f6a6c am 567562a9: am 567c7408: Merge "Fix typo in JavaDoc for TypeEvaluator." into klp-dev 
* commit '567562a9822fe6e39ab0ece2654bd4833b74dc2b':
  Fix typo in JavaDoc for TypeEvaluator.
 2013-08-16 18:20:44 -07:00
Sascha Haeberling
567562a982 am 567c7408: Merge "Fix typo in JavaDoc for TypeEvaluator." into klp-dev 
* commit '567c7408cbc1f7ae5383e849374c4a9f9d90de46':
  Fix typo in JavaDoc for TypeEvaluator.
 2013-08-16 18:19:14 -07:00
Sascha Haeberling
567c7408cb Merge "Fix typo in JavaDoc for TypeEvaluator." into klp-dev 2013-08-17 01:16:22 +00:00
Ruben Brunk
f1cd0a1ac0 am 3c6dad19: am 94a26df8: Merge "Refactor CameraService to handle errors properly." into klp-dev 
* commit '3c6dad193367f499112b57e506183f02419a2e00':
  Refactor CameraService to handle errors properly.
 2013-08-16 17:36:48 -07:00
Ruben Brunk
3c6dad1933 am 94a26df8: Merge "Refactor CameraService to handle errors properly." into klp-dev 
* commit '94a26df84f226120075ca3d9866f2687e11c9dcd':
  Refactor CameraService to handle errors properly.
 2013-08-16 17:33:51 -07:00
Ruben Brunk
94a26df84f Merge "Refactor CameraService to handle errors properly." into klp-dev 2013-08-17 00:29:37 +00:00
Jeff Sharkey
000f24f844 am bef53cec: am d1da6701: Merge "Richer ParcelFileDescriptor close events." into klp-dev 
* commit 'bef53cec5c6580535501d5a7305cc5223e9095b6':
  Richer ParcelFileDescriptor close events.
 2013-08-16 17:13:44 -07:00
Jeff Sharkey
bef53cec5c am d1da6701: Merge "Richer ParcelFileDescriptor close events." into klp-dev 
* commit 'd1da67017f0e1c8a47cb61050c8d7a753efc918c':
  Richer ParcelFileDescriptor close events.
 2013-08-16 17:10:46 -07:00
Jeff Sharkey
d1da67017f Merge "Richer ParcelFileDescriptor close events." into klp-dev 2013-08-17 00:05:36 +00:00
Dmitry Shmidt
ababd4944d am 07c1bd79: am b3acd8ef: Merge "wifi: Do not use prefix for p2p commands" into klp-dev 
* commit '07c1bd7947052db101c4d1a0385049a398f9027f':
  wifi: Do not use prefix for p2p commands
 2013-08-16 16:52:41 -07:00
Dmitry Shmidt
07c1bd7947 am b3acd8ef: Merge "wifi: Do not use prefix for p2p commands" into klp-dev 
* commit 'b3acd8ef263e17879e9a13c3dacd123bd0670c3b':
  wifi: Do not use prefix for p2p commands
 2013-08-16 16:50:00 -07:00
Chet Haase
5a640a4a9a am 150efdea: am d1477e74: Merge "Better Transition interruption" into klp-dev 
* commit '150efdeae2b4c6b25f1cdfa8bdc6926351ca2ed6':
  Better Transition interruption
 2013-08-16 16:49:09 -07:00
Chet Haase
150efdeae2 am d1477e74: Merge "Better Transition interruption" into klp-dev 
* commit 'd1477e746065450b1900398e103f4715ccf81b35':
  Better Transition interruption
 2013-08-16 16:46:31 -07:00
Dmitry Shmidt
b3acd8ef26 Merge "wifi: Do not use prefix for p2p commands" into klp-dev 2013-08-16 23:45:52 +00:00
David Christie
6d41444dfd am 6bc4f22a: am 0ef054b5: Merge "Add comments to new hidden API in LocationRequest. Document their purpose and permissions required in case this is unhidden in a different code line." into klp-dev 
* commit '6bc4f22a015897d90e92751b252cf60d61589ea0':
  Add comments to new hidden API in LocationRequest. Document their purpose and permissions required in case this is unhidden in a different code line.
 2013-08-16 16:45:42 -07:00
David Christie
6bc4f22a01 am 0ef054b5: Merge "Add comments to new hidden API in LocationRequest. Document their purpose and permissions required in case this is unhidden in a different code line." into klp-dev 
* commit '0ef054b5f15b2486e2bc002cfc7b9af6dc8c2d2b':
  Add comments to new hidden API in LocationRequest. Document their purpose and permissions required in case this is unhidden in a different code line.
 2013-08-16 16:43:05 -07:00
Chet Haase
d1477e7460 Merge "Better Transition interruption" into klp-dev 2013-08-16 23:41:29 +00:00
David Christie
0ef054b5f1 Merge "Add comments to new hidden API in LocationRequest. Document their purpose and permissions required in case this is unhidden in a different code line." into klp-dev 2013-08-16 23:37:48 +00:00
Matthew Williams
341ce08c27 am 1a7c5233: am 0c5b96b1: Merge "Use pending.xml to persist sync ops." into klp-dev 
* commit '1a7c52335e6fc6f1e398f868ffca0be3de83abb4':
  Use pending.xml to persist sync ops.
 2013-08-16 16:19:24 -07:00
Matthew Williams
1a7c52335e am 0c5b96b1: Merge "Use pending.xml to persist sync ops." into klp-dev 
* commit '0c5b96b1cd6c0d7523e0653682a146dfbc9ad659':
  Use pending.xml to persist sync ops.
 2013-08-16 16:16:48 -07:00
David Christie
3e32bdd418 Add comments to new hidden API in LocationRequest. 
Document their purpose and permissions required in case
this is unhidden in a different code line.

Change-Id: I42f6f950157f488cf51b361e3411861ff98794e8
 2013-08-16 16:16:27 -07:00
Jeff Tinker
5d88d7108b am e70d9154: am df717aaa: Merge "Fix JNI method called with exception pending" into klp-dev 
* commit 'e70d9154c812c76b307fb373c7b9e87638f91bca':
  Fix JNI method called with exception pending
 2013-08-16 16:12:31 -07:00
Matthew Williams
0c5b96b1cd Merge "Use pending.xml to persist sync ops." into klp-dev 2013-08-16 23:10:57 +00:00
Jeff Tinker
e70d9154c8 am df717aaa: Merge "Fix JNI method called with exception pending" into klp-dev 
* commit 'df717aaa258e88c1af40b61e42aab86dabec8f61':
  Fix JNI method called with exception pending
 2013-08-16 16:09:04 -07:00
Jeff Tinker
df717aaa25 Merge "Fix JNI method called with exception pending" into klp-dev 2013-08-16 23:04:54 +00:00
David Christie
e13502b6b4 am afe553bb: am d0d55457: Merge "Use default class loader when creating a LocationRequest from Parcel. This seems to be the standard usage, and there are rare reports of requestLocationUpdates giving NullPointerExceptions on the first call to requestLocationUpdates bu 
* commit 'afe553bbfad0eca8d8de898023ed2029ea34d235':
  Use default class loader when creating a LocationRequest from Parcel. This seems to be the standard usage, and there are rare reports of requestLocationUpdates giving NullPointerExceptions on the first call to requestLocationUpdates but not on subsequent calls (b/10207898).
 2013-08-16 16:04:48 -07:00
David Christie
afe553bbfa am d0d55457: Merge "Use default class loader when creating a LocationRequest from Parcel. This seems to be the standard usage, and there are rare reports of requestLocationUpdates giving NullPointerExceptions on the first call to requestLocationUpdates but not on subs 
* commit 'd0d554579b244d8d98e63e866be19333a8aa8b2e':
  Use default class loader when creating a LocationRequest from Parcel. This seems to be the standard usage, and there are rare reports of requestLocationUpdates giving NullPointerExceptions on the first call to requestLocationUpdates but not on subsequent calls (b/10207898).
 2013-08-16 16:01:29 -07:00
David Christie
a91f3351eb am b1be77ef: am e3c754bb: Merge "Ensure LocationRequest\'s worksource defaults to null Helps to make sure the service doesn\'t throw a SecurityException for not having the UPDATE_DEVICE_STATS permission." into klp-dev 
* commit 'b1be77ef4a135ce50f71e5d89a4b740f4fccb11c':
  Ensure LocationRequest's worksource defaults to null Helps to make sure the service doesn't throw a SecurityException for not having the UPDATE_DEVICE_STATS permission.
 2013-08-16 15:57:58 -07:00
David Christie
d0d554579b Merge "Use default class loader when creating a LocationRequest from Parcel. This seems to be the standard usage, and there are rare reports of requestLocationUpdates giving NullPointerExceptions on the first call to requestLocationUpdates but not on subsequent calls (b/10207898)." into klp-dev 2013-08-16 22:55:21 +00:00
David Christie
b1be77ef4a am e3c754bb: Merge "Ensure LocationRequest\'s worksource defaults to null Helps to make sure the service doesn\'t throw a SecurityException for not having the UPDATE_DEVICE_STATS permission." into klp-dev 
* commit 'e3c754bb1c518c9166ff4275b5ee59f36c999f4c':
  Ensure LocationRequest's worksource defaults to null Helps to make sure the service doesn't throw a SecurityException for not having the UPDATE_DEVICE_STATS permission.
 2013-08-16 15:50:38 -07:00
David Christie
e3c754bb1c Merge "Ensure LocationRequest's worksource defaults to null Helps to make sure the service doesn't throw a SecurityException for not having the UPDATE_DEVICE_STATS permission." into klp-dev 2013-08-16 22:45:34 +00:00
Elliott Hughes
e01a013518 am dd61730d: am 48570adf: Merge "Fix NPE in DateFormat.is24HourFormat." into klp-dev 
* commit 'dd61730d8e650a56793f8d7f97f6795b6f253edc':
  Fix NPE in DateFormat.is24HourFormat.
 2013-08-16 15:22:06 -07:00
Elliott Hughes
dd61730d8e am 48570adf: Merge "Fix NPE in DateFormat.is24HourFormat." into klp-dev 
* commit '48570adfd927ac1d3bb2a2671a5f54bba573155e':
  Fix NPE in DateFormat.is24HourFormat.
 2013-08-16 15:19:13 -07:00