80569 Commits

Author SHA1 Message Date
Adam Powell
53059537c9 DO NOT MERGE - Use focal point for scrolling in GestureDetector
Remove workaround for obsolete touchscreen hardware. Provide a better
focal point for scroll events.

Change-Id: I173cd6696dace379437b56597c4a6ac5c7fbf60d
2012-08-30 13:23:22 -07:00
Adam Powell
d33b6217fc DO NOT MERGE - New implementation for ScaleGestureDetector
This solves the problems around active pointer tracking when the
caller may skip events in the MotionEvent stream and replaces the
old implementation with a much simpler algorithm.

Change-Id: I97c0bfad03a6190e403e843d382e05ff2257b66f
2012-08-30 13:18:43 -07:00
Jake Hamby
dba8a81d93 Fix CDMA decoding of multipart UTF-16 SMS messages.
Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: Iba9e7156bd7df94e972963959a7ce1c78464f7f5
2012-08-30 12:10:04 -07:00
John Reck
8f58dfa975 am da5cd308: am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
* commit 'da5cd308028f8f6863bbe3631de91b96802695ec':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
2012-08-30 11:43:34 -07:00
John Reck
da5cd30802 am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
* commit 'ae03afda41ace0721e48ed15ce35345bfa033116':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
2012-08-30 11:41:38 -07:00
John Reck
ae03afda41 Merge "onSavePassword dialog can leak when WebViewClassic is destroyed." 2012-08-30 11:00:22 -07:00
rikard dahlman
9211b13c32 Watchdog: Improvement of debuggability
If the watchdog detects a problem the system server process
is killed, that is followed by a crash. Because the crash is
done after the system server process is killed, the crash
don't contain info about the system server.
This improvement will make sure that the system is crashed
before the system server process is killed.
Behavior is only changed for eng and userdebug builds.

Change-Id: I9f1c8fd8b03d0114032ed44fb582705ad0b49733
2012-08-30 12:27:50 +02:00
Johan Redestig
8655e9085c onSavePassword dialog can leak when WebViewClassic is destroyed.
The AlertDialog creates in onSavePassword method leaks if
WebViewClassic is destroyed when the dialog is shown.

Change-Id: I81f20e1dd138467a6413766c0a081b389b334ae0
2012-08-30 10:13:41 +02:00
Jake Hamby
044a9b97b0 resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp
Change-Id: Idec590dbd9e051a3faeded1af9eb4a78216f0496
2012-08-29 18:09:29 -07:00
Jake Hamby
b35e4d778a Fix CDMA decoding of multipart UTF-16 SMS messages.
Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: Iba9e7156bd7df94e972963959a7ce1c78464f7f5
2012-08-29 16:36:22 -07:00
The Android Automerger
f63029b499 merge in jb-release history after reset to jb-dev 2012-08-29 14:29:53 -07:00
Katie McCormick
6dd530ff8d Doc update: Fix typo.
Change-Id: Idc968ed864b28a65ae71fd1f1336e769ae445f88
2012-08-29 13:37:01 -07:00
Jean-Baptiste Queru
4a4edbbfce am 7fecf5f4: Merge "Make addAddress locale safe"
* commit '7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
  Make addAddress locale safe
2012-08-29 12:59:06 -07:00
The Android Automerger
c7c8729f91 merge in jb-release history after reset to jb-dev 2012-08-29 12:43:08 -07:00
Jean-Baptiste Queru
7fecf5f451 Merge "Make addAddress locale safe" 2012-08-29 12:19:04 -07:00
Jean-Baptiste Queru
14c0c989d2 am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
* commit '4ba4caede125ff602b0d93f577f9054a07791ff7':
  Fix SkBitmap::fPixels not being locked correctly
2012-08-29 11:55:20 -07:00
Jean-Baptiste Queru
4ba4caede1 Merge "Fix SkBitmap::fPixels not being locked correctly" 2012-08-29 11:27:31 -07:00
Jean-Baptiste Queru
15e099cc09 am 0e0942c7: Merge "Default WiFi sleep policy setting"
* commit '0e0942c7209c758bc00939ae54059dc24bce3abb':
  Default WiFi sleep policy setting
2012-08-29 10:49:25 -07:00
Irfan Sheriff
c5f34bd40b am 48c45d0e: Merge "Fix join scenario with provision discovery"
* commit '48c45d0e3bcacebfc3635bc893875146b7ecb787':
  Fix join scenario with provision discovery
2012-08-29 10:49:20 -07:00
Jean-Baptiste Queru
0e0942c720 Merge "Default WiFi sleep policy setting" 2012-08-29 09:50:45 -07:00
Irfan Sheriff
48c45d0e3b Merge "Fix join scenario with provision discovery" 2012-08-29 09:47:27 -07:00
Irfan Sheriff
127efc4e25 Fix join scenario with provision discovery
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
2012-08-29 08:36:17 -07:00
Michal Stawinski
35ef567140 Fix SkBitmap::fPixels not being locked correctly
In some cases bitmap's pixels where freed during encoding, which
caused a null pointer dereference.
This fix makes sure that underlaying buffer is locked for the whole
process of compression.

Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
2012-08-29 15:54:01 +02:00
Erik Ljungberg
7e07147ece Default WiFi sleep policy setting
Creates a defult.xml setting for WiFi sleep policy.

It is now possible, through device overlays, to change
the default sleep policy to e.g. never in order to improve
user experience of WiFi.

Change-Id: Ie459b8e70fdbc7c605452fe0692d7bc26460e939
2012-08-29 09:52:12 +02:00
Johan Redestig
7314532349 Make SimpleSessionDescription locale safe
Explicitly use Locale.US in SimpleSessionDescription to avoid
unexpected results in some locales.

Change-Id: Idb4a36a9e332d302e1b9b940355917c0f738e076
2012-08-29 08:21:05 +02:00
Johan Redestig
3cd42dfd50 Make addAddress locale safe
Using regular string concatenation to avoid unexpected
results in some locales.

Change-Id: I47dd5e174c4a2e88dc18e014002820cdbf63fcad
2012-08-29 08:07:02 +02:00
John Reck
2ec1098961 DO NOT MERGE Remove dead code
Cherry pick

Change-Id: I19603a6e234b0b2592ef90fd426b2973cff8e4fd
2012-08-28 16:29:51 -07:00
Daniel Sandler
393e3170b3 am ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"
* commit 'ad955fe87f44b43dbb2842fdcbe4e62900b5a07f':
  SystemUI: Fix data activity overlay not being removed when data is disabled
2012-08-28 13:19:52 -07:00
Jean-Baptiste Queru
1112a376e8 am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter"
* commit '416362e6d8c8d0a34e09704138688f75aa810c9b':
  Change StringTokenizer to TextUtils.StringSplitter
2012-08-28 13:19:48 -07:00
Daniel Sandler
ad955fe87f Merge "SystemUI: Fix data activity overlay not being removed when data is disabled" 2012-08-28 12:52:49 -07:00
Jean-Baptiste Queru
416362e6d8 Merge "Change StringTokenizer to TextUtils.StringSplitter" 2012-08-28 12:22:39 -07:00
Jean-Baptiste Queru
337756fa65 am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
* commit '78ad66b43cf5b649869de18ee9c246c95b135c10':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
2012-08-28 11:08:22 -07:00
Jean-Baptiste Queru
78ad66b43c Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 2012-08-28 10:43:10 -07:00
Adam Koch
9977dddee3 Updates to "Displaying Bitmaps Efficiently" class.
Changes:
 -Updated code sample (see http://ag/214812)
 -Updated code snippets to match updated sample
 -Fixed <> in code snippets
 -Updated disk cache section
 -Some other minor updates

Change-Id: Id7ca4d161f165814d71f238f940b2c5bfbc220aa
2012-08-28 10:42:55 -04:00
Irfan Sheriff
129d6fac00 am 67ea8c86: Merge "Added a persistent feature in WiFi Direct."
* commit '67ea8c86419ffbf603052e816d6b1e9e7e20fbb9':
  Added a persistent feature in WiFi Direct.
2012-08-27 17:57:29 -07:00
Irfan Sheriff
67ea8c8641 Merge "Added a persistent feature in WiFi Direct." 2012-08-27 17:54:07 -07:00
The Android Open Source Project
e9c7efda14 Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I0387880d7a374b53a5d0f58c7c2234a4ae3cf325
2012-08-27 14:11:17 -07:00
Dianne Hackborn
aae4943297 am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
* commit '4763989d95342c25e9b857dc9ee21eb5ebac31d6':
  Fixes relative time formatting issue for dates in future
2012-08-27 12:33:57 -07:00
Dianne Hackborn
4763989d95 am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
* commit '32d1fec50baaecdea34ae2a47ca808e8e4181ed2':
  Fixes relative time formatting issue for dates in future
2012-08-27 12:31:49 -07:00
Dianne Hackborn
32d1fec50b Merge "Fixes relative time formatting issue for dates in future" 2012-08-27 11:39:10 -07:00
Jean-Baptiste Queru
3221b33322 am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"
* commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
  Make setCaptureRate locale safe
2012-08-27 11:29:29 -07:00
Jean-Baptiste Queru
26ad1e7874 am 03d16e12: Merge "Make setCaptureRate locale safe"
* commit '03d16e122aa01f9283836d1e5144428082b4c1cd':
  Make setCaptureRate locale safe
2012-08-27 11:28:00 -07:00
Jean-Baptiste Queru
03d16e122a Merge "Make setCaptureRate locale safe" 2012-08-27 10:22:29 -07:00
Jean-Baptiste Queru
ba37d595f7 am e70a32af: am eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern"
* commit 'e70a32afc5b27ddc9681efd867780a0c4c77edd3':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
2012-08-27 08:13:27 -07:00
Jean-Baptiste Queru
e70a32afc5 am eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern"
* commit 'eb00f951439cd724863d267e8e8d77414383d93f':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
2012-08-27 08:11:19 -07:00
Jean-Baptiste Queru
eb00f95143 Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 2012-08-27 07:55:41 -07:00
Yoshihiko Ikenaga
0879d03f0a Added a persistent feature in WiFi Direct.
Provide a new feature to use persistent group at default.
In the normal connect sequence, if the persistent profile has been
stored, try to use it. Otherwise, a new persistent group is created.
If the persistent profiles are stored over 32, an old profile is
deleted automatically.

Change-Id: Iccb9fa044f1907f0818cd259275e1675f4c3e222
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-08-27 21:54:44 +09:00
Johan Redestig
1c7928e8c6 Make setCaptureRate locale safe
Dont use the default String.format in setCaptureRate as it is both
locale unsafe and less efficient than regular string concatenation
in this case.

Change-Id: I29418ec0352ef8c79967592b6eb8ff66cc9c99f0
2012-08-27 14:24:10 +02:00
Steve Pomeroy
ca3363775e Fixes relative time formatting issue for dates in future
All variations of getRelativeTimeSpanString() now properly handle dates
that are in the future. Prior, the version used by
getRelativeDateTimeString() would occasionally show the time instead of
a date when the future date was the same weekday as the current weekday.
This resulted in the time output being duplicated, eg.: "11:23, 11:23"

Change-Id: If20972a6942cce792fa233437f94dedfb71379f3
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2012-08-27 02:20:13 -04:00
Dirk Dougherty
2f1ec0db61 am cf9e9d62: Design doc change: Update download zips for design bundle and Roboto.
* commit 'cf9e9d627367d310fb910a052dda1e020748a94c':
  Design doc change: Update download zips for design bundle and Roboto.
2012-08-24 14:43:18 -07:00