111121 Commits

Author SHA1 Message Date
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
Elliott Hughes
48570adfd9 Merge "Fix NPE in DateFormat.is24HourFormat." into klp-dev 2013-08-16 22:14:42 +00:00
Romain Guy
fa017cd3db am 34d89c6b: am 836d335f: Merge "Prevent ANR in apps using drawPath() Bug #10347089" into klp-dev
* commit '34d89c6b052ad8812c2c1a6eb55da64ee0dc67ee':
  Prevent ANR in apps using drawPath() Bug #10347089
2013-08-16 15:07:37 -07:00
Romain Guy
34d89c6b05 am 836d335f: Merge "Prevent ANR in apps using drawPath() Bug #10347089" into klp-dev
* commit '836d335f9a43e1ebcd2291b211ac04116971124e':
  Prevent ANR in apps using drawPath() Bug #10347089
2013-08-16 15:03:51 -07:00
Romain Guy
836d335f9a Merge "Prevent ANR in apps using drawPath() Bug #10347089" into klp-dev 2013-08-16 21:56:40 +00:00
Elliott Hughes
f9818d33f9 Fix NPE in DateFormat.is24HourFormat.
In some cases, we end up being called by code that doesn't have a valid
Context. It got away with this historically because it wasn't formatting
times (just dates), so it never went down a path that tried to query the
user's 12/24-hour preference. This patch just ensures that we don't try
to get the preference unless we actually need it.

Bug: 10339015

(cherry picked from commit 8d8ef00c8276200f108433922761401817fd9a50)

Change-Id: If074a67fa52943c0ec7bb5c5bbe5a11f54fb1f97
2013-08-16 14:53:26 -07:00
Fabrice Di Meglio
e710a5f5f6 am 6c9b6aea: am 3c226bf6: Merge "Fix old remaining i18n bugs on TimePicker:" into klp-dev
* commit '6c9b6aea1280c83cd11320ea636fff3acb26c496':
  Fix old remaining i18n bugs on TimePicker:
2013-08-16 14:45:08 -07:00
Romain Guy
b0a41ed3dc Prevent ANR in apps using drawPath()
Bug #10347089

If an app clears its path cache before stopping background tasks, it could
get into an infinite loop in PathCache::trim().

Change-Id: Ieb865b762e7b00aebaba0c023769c2db286a94f5
2013-08-16 14:44:38 -07:00
Fabrice Di Meglio
6c9b6aea12 am 3c226bf6: Merge "Fix old remaining i18n bugs on TimePicker:" into klp-dev
* commit '3c226bf6acea0b8dff34a2113009b6d918a3af65':
  Fix old remaining i18n bugs on TimePicker:
2013-08-16 14:42:59 -07:00
Fabrice Di Meglio
3c226bf6ac Merge "Fix old remaining i18n bugs on TimePicker:" into klp-dev 2013-08-16 21:38:29 +00:00
Fabrice Di Meglio
64902bd89e Fix old remaining i18n bugs on TimePicker:
- put am/pm on the left side of hours for hu, zh, ja and ko Locales
- use the hours/minutes separator from the Locale (fi, sr, ...)
- updated layouts (better for Arabic, Farsi and Hebrew)
- support double digits format for 12h and single digit format for
24h (it, ja, vi, ...)
- fix setIs24HourView(boolean) behavior: do not lose the current hour
value when switching from 12h to 24h

Change-Id: If66cb6f802d894f0a2357b43eede6854791f3b67
2013-08-16 14:34:25 -07:00
Elliott Hughes
e78abd7908 am ae736452: am 2a8be3cf: am ecdf20d4: Merge "Fix NPE in DateFormat.is24HourFormat."
* commit 'ae73645241ff0627ed924a8395b83aa59dc326ea':
  Fix NPE in DateFormat.is24HourFormat.
2013-08-16 14:23:42 -07:00
Elliott Hughes
ae73645241 am 2a8be3cf: am ecdf20d4: Merge "Fix NPE in DateFormat.is24HourFormat."
* commit '2a8be3cf5ebabbbb0c42d946f28cfe33d5653be6':
  Fix NPE in DateFormat.is24HourFormat.
2013-08-16 14:20:50 -07:00
Elliott Hughes
2a8be3cf5e am ecdf20d4: Merge "Fix NPE in DateFormat.is24HourFormat."
* commit 'ecdf20d4fec6107ee49e315cff3dc73f65569843':
  Fix NPE in DateFormat.is24HourFormat.
2013-08-16 14:17:10 -07:00
Elliott Hughes
ecdf20d4fe Merge "Fix NPE in DateFormat.is24HourFormat." 2013-08-16 21:14:19 +00:00
Igor Murashkin
3db3b83c03 am 0210bf08: am aa973d1d: Merge "media: Fix ImageReader only using maxImages=1 no matter what" into klp-dev
* commit '0210bf08621c363780b53c1251548719043da194':
  media: Fix ImageReader only using maxImages=1 no matter what
2013-08-16 14:13:23 -07:00
David Christie
6de1047278 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.

Change-Id: I9be0302f1378d2c4441e6b7d5ce472ed0d5fbd80
2013-08-16 14:12:59 -07:00
Igor Murashkin
0210bf0862 am aa973d1d: Merge "media: Fix ImageReader only using maxImages=1 no matter what" into klp-dev
* commit 'aa973d1d0b62f1645318b9c9da9212b0bc54246d':
  media: Fix ImageReader only using maxImages=1 no matter what
2013-08-16 14:10:36 -07:00
Romain Guy
3b0ca9c13c am bd3c2c3d: am 88105179: Merge "Clear FBO cache on full memory flush" into klp-dev
* commit 'bd3c2c3d704fe5348ae9501f52cf9591a17e1a1e':
  Clear FBO cache on full memory flush
2013-08-16 14:05:29 -07:00
Igor Murashkin
aa973d1d0b Merge "media: Fix ImageReader only using maxImages=1 no matter what" into klp-dev 2013-08-16 21:04:15 +00:00
Romain Guy
bd3c2c3d70 am 88105179: Merge "Clear FBO cache on full memory flush" into klp-dev
* commit '88105179ed90825dd447d5fcc95d18a20dc2f4c3':
  Clear FBO cache on full memory flush
2013-08-16 14:03:44 -07:00
Romain Guy
88105179ed Merge "Clear FBO cache on full memory flush" into klp-dev 2013-08-16 20:59:01 +00:00
Romain Guy
b746371de7 Clear FBO cache on full memory flush
Change-Id: I44e06d5d15cd899a0522c62d7c0d042170665abb
2013-08-16 13:55:29 -07:00
Jeff Tinker
8117d8f702 Fix JNI method called with exception pending
bug: 10313912
Change-Id: I8390905334f2e37f210adced52c31e7a431d4f55
2013-08-16 13:46:02 -07:00
Chet Haase
199acdfcc9 Better Transition interruption
Previously, a running transition on a scene root would simply
be canceled when a new transition was started. This would result in
abrupt scene changes, especially in generic use cases where apps/widgets
would spawn multiple transitions in successive rendering frames due to
small changes in view properties.

The new approach is to check all running animations against new transitions.
If there are overlapping properties that are being set to different values,
the new animations win and the old ones are canceled. If the end values are the
same, the new animations are noop'd and the old ones are allowed to continue
as-is.

There was also improvement to capturing state while other transitions are
running, necessary in this new world where old transitions are allowed to
continue running. Now, transitions are pause()'d while values are captured,
then resume()'d after capturing is done. This allows the system to see what the
real view properties are, instead of the mid-animation values.

Change-Id: I8e77fb9c1967087a682bb26a45763005f5ca9179
2013-08-16 13:22:36 -07:00
Lajos Molnar
f2ea4f9c40 am 3b1cf4ef: am dad0f462: Merge "MediaFormat: added subtitle format" into klp-dev
* commit '3b1cf4efb936a9b5b84713ffe172c68f67bfc972':
  MediaFormat: added subtitle format
2013-08-16 12:26:06 -07:00
Lajos Molnar
3b1cf4efb9 am dad0f462: Merge "MediaFormat: added subtitle format" into klp-dev
* commit 'dad0f462ae6fee99840bbea910c810282bbc1c54':
  MediaFormat: added subtitle format
2013-08-16 12:23:56 -07:00