106299 Commits

Author SHA1 Message Date
Marco Nelissen
f38b528701 Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well" 2013-07-30 17:11:55 +00:00
Lorenzo Colitti
8fcad020e0 Merge "Make legacy VPN work over stacked interfaces." 2013-07-30 16:50:41 +00:00
Lorenzo Colitti
158840079a Merge "464xlat: use a gatewayed route, not point-to-point" 2013-07-30 16:50:05 +00:00
Jean-Baptiste Queru
e700a36e40 Merge "Update getCheckedItemPositions() documentation" 2013-07-30 16:16:38 +00:00
Lorenzo Colitti
bc8f82fb1f Make legacy VPN work over stacked interfaces.
On stacked interfaces like 464xlat, Legacy VPN can't find the
default gateway because it uses getRoutes, which only returns
routes for the base link and not for the stacked links. It also
assumes that the interface that the default route points to is
the interface for the base link (e.g., rmnet0) instead of the
interface the route actually points to (e.g., clat4).

Fix this by calling getAllRoutes to find the default IPv4 route,
and get the interface name from the route we find instead of
assuming it's the base interface.

Bug: 9597516
Change-Id: Ia6ce0b6258a421cd22f60dedca7e94176b32176b
2013-07-31 01:14:30 +09:00
Lorenzo Colitti
efa73c05f7 464xlat: use a gatewayed route, not point-to-point
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.

Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:

default dev clat4  scope link

to:

default via 192.0.0.4 dev clat4  scope link
192.0.0.4 dev clat4  scope link

and those apps now work.

Bug: 9597256
Bug: 9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6
2013-07-31 01:09:53 +09:00
Michael Wright
b7dfa02766 Merge "Remove deleted keylayout from Makefile" 2013-07-30 02:26:01 +00:00
Michael Wright
9fd5530f4c Remove deleted keylayout from Makefile
Change-Id: I8aecc00861cf99d8e7278519f4e2e6fb726b7e17
2013-07-29 19:24:49 -07:00
Jean-Baptiste Queru
6c0fe0df4e Merge "MediaFormat: Fix the documentation link to the AAC profile constants" 2013-07-29 23:03:00 +00:00
Michael Wright
b0326880a9 Merge "Remove incorrect keymapping" 2013-07-29 22:50:01 +00:00
Michael Wright
6fc03389c7 Remove incorrect keymapping
Turns out Snakebytes produce all 0s for their vendor / product IDs. This
somehow got the vendor / product ID of an international apple keyboard, which
will break them. Unfortunately, this also means we cannot map Snakebyte
controllers at all.

Relevant bug: https://code.google.com/p/android/issues/detail?id=58202

Change-Id: I09d246b1ab793ec04a19d558f6b98badac48b20f
2013-07-29 15:48:55 -07:00
Marco Nelissen
161b3624c2 Merge "Fix NullpointerException in MediaMetadataRetriever" 2013-07-26 21:13:59 +00:00
Oscar Rydhé
425916e4c5 Fix NullpointerException in MediaMetadataRetriever
According to the API documentation and the ICS implementation
the setDataSource(String) method throws an
IllegalArgumentException if path is null. In JB a
NullpointerException is thrown instead. This fix restores
the earlier behaviour.

Change-Id: Ic47baadf91076acc227d92d84f6b8d1d6ecd0c03
2013-07-26 18:18:17 +00:00
Chet Haase
d547bcec56 Merge "Return the actual interpolator of the ViewPropertyAnimator" 2013-07-25 21:46:49 +00:00
Elliott Hughes
03bd832461 Merge "Switch DateUtils.formatDateRange over to an icu4c-based implementation." 2013-07-25 17:19:35 +00:00
Martin Storsjo
816af56eac MediaFormat: Fix the documentation link to the AAC profile constants
Change-Id: If1780436baa2884cea05ccd8ab74745af790eb17
2013-07-25 12:53:46 +03:00
Cyril Mottier
d40acfb89e Return the actual interpolator of the ViewPropertyAnimator
The implementation of getInterpolator() was always returning null
(probably a quick copy-paste from the default Animator implementation).
This patch fixes the problem by returning the interpolator set by
setInterpolator(TimeInterpolator) or the default one if none has been
set yet.

This patch also avoid creating multiple instances of ValueAnimator in 
order to retrieve some default values.

Change-Id: I8880f419f021a8b980fb32bebe927915fde19bf7
2013-07-25 10:08:29 +02:00
Martin Storsjo
158754b1bf MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
If reading the decoded pixel data (instead of letting the system
render it), this is critical for interpreting the data correctly.

The video MediaCodec CTS tests use this MediaFormat key in this
way as well.

Therefore, make sure the documentation reflects the actual use of
this field - claiming that it is encoder-only is misleading.

Change-Id: I9bfd295a95dd3e7d1fa3189886fd243b07bb82cc
2013-07-25 10:52:54 +03:00
Elliott Hughes
6139e64cd6 Switch DateUtils.formatDateRange over to an icu4c-based implementation.
Bug: 7289514
Change-Id: Ia382f49aa23737bde91b7891d95545da084ec57c
2013-07-24 14:46:31 -07:00
Cyril Mottier
82ff241fd6 Update getCheckedItemPositions() documentation
getCheckedItemPositions()'s documentation previously mentioned the 
returned SparseBooleanArray was only containing checked item positions 
(i.e. get(int position) always returning true). In practice, this is 
wrong, because getCheckedItemPositions() returns mCheckStates which 
basically contains all key-value mappings that have been used. As a 
consequence if the item at position p is checked and unchecked, the 
returned SparseBooleanArray will contain a (p, false) mapping.

Another option could be to delete all keys having a false value.

Change-Id: I15f8fc2a1ba3f1501af126c272b827402cfd8b14
2013-07-23 13:58:33 +02:00
Chet Haase
dbc51de44f am 53771e5f: Merge "Remove useless/repetitive code"
* commit '53771e5f955f67035cf6b6432c34171a18ab14dc':
  Remove useless/repetitive code
2013-07-22 08:59:30 -07:00
Chet Haase
53771e5f95 Merge "Remove useless/repetitive code" 2013-07-22 15:55:52 +00:00
Elliott Hughes
e964387466 am 0bad5370: Merge "Handle missing and invalid numeric values in XmlUtils."
* commit '0bad537093ed5b493e4c2af778cf802a2cf2c15f':
  Handle missing and invalid numeric values in XmlUtils.
2013-07-18 10:41:41 -07:00
Elliott Hughes
0bad537093 Merge "Handle missing and invalid numeric values in XmlUtils." 2013-07-18 17:38:57 +00:00
Elliott Hughes
03a152d7e7 am 15cb526e: Merge "Fix import after okhttp update."
* commit '15cb526ece1420b1ae2061e20fd0982d82b41aae':
  Fix import after okhttp update.
2013-07-18 09:36:48 -07:00
Elliott Hughes
15cb526ece Merge "Fix import after okhttp update." 2013-07-18 16:33:41 +00:00
Narayan Kamath
c0bb16673e Fix import after okhttp update.
OkResponseCache moved packages in change
62321.

Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
2013-07-18 13:42:50 +01:00
Adam Powell
42658ed518 am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '30ad720304790b07112b87f973a7e6ed5e1e6ee5':
  Consider mScrollX when drawing the checkMarkDrawable
2013-07-16 17:06:36 -07:00
Adam Powell
30ad720304 Merge "Consider mScrollX when drawing the checkMarkDrawable" 2013-07-17 00:04:28 +00:00
The Android Open Source Project
59734490f6 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
2013-07-15 09:32:49 -07:00
The Android Automerger
d67c55b8d0 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:11 -07:00
Cyril Mottier
5f5882ffa8 Remove useless/repetitive code
fixScale(float) method has been extracted from the code but the original
code has been kept in place. Because of this, the animation scale is 
"fixed" twice which is not necessary. This patch, simply call 
fixScale(float) once and stores the result of it in the scale variable.

Change-Id: I50aeacbc2c13ebbf447506ae4309d50c0e313837
2013-07-15 15:38:10 +02:00
Adam Powell
45130c62e1 am 1dc3b790: am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '1dc3b790df61aa95cb68da390045249c59049fcd':
  PreferenceActivity should not leave message in looper when destroyed
2013-07-12 15:11:41 -07:00
Adam Powell
1dc3b790df am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
  PreferenceActivity should not leave message in looper when destroyed
2013-07-12 15:09:54 -07:00
Adam Powell
4b8cc94cc6 Merge "PreferenceActivity should not leave message in looper when destroyed" 2013-07-12 22:07:04 +00:00
Scott Main
e86ba6dcbe am 797a99ff: am c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos
* commit '797a99ff3e7e1fd81f8def2e5ca4ea089c01ad06':
  add warning for Windows users and fix typos
2013-07-12 14:28:40 -07:00
Scott Main
797a99ff3e am c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos
* commit 'c0f5bb70b72c25c0057d2318bbcc8d79553d1e12':
  add warning for Windows users and fix typos
2013-07-12 14:22:48 -07:00
Scott Main
c0f5bb70b7 am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos
* commit 'ca4b112eb243b1350aba000c4f021574be25bd96':
  add warning for Windows users and fix typos
2013-07-12 14:20:11 -07:00
Scott Main
ca4b112eb2 am 546ac85a: am ad17523d: add warning for Windows users and fix typos
* commit '546ac85a834cf033cf1f3ce82624f1f4a63d099f':
  add warning for Windows users and fix typos
2013-07-12 14:17:30 -07:00
Scott Main
546ac85a83 am ad17523d: add warning for Windows users and fix typos
* commit 'ad17523da976c2d6b7b70fd3aa9ad290e4731224':
  add warning for Windows users and fix typos
2013-07-12 14:15:15 -07:00
Scott Main
ad17523da9 add warning for Windows users and fix typos
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
2013-07-12 14:09:38 -07:00
Wink Saville
97b077bc18 am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '42a85412d12078f36c3fdeda1211bdc3800bab0c':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:03:53 -07:00
Wink Saville
42a85412d1 am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '925ec03fcd9651ff4c6b04982eb6d930b16493b9':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:01:41 -07:00
Wink Saville
925ec03fcd Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev 2013-07-12 18:59:03 +00:00
Amith Yamasani
8361a9f719 am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '1a1a7c0878320b94d01da6bdfaa857c85b4199a3':
  Pass along the user id to AttributeCache requests
2013-07-12 11:21:27 -07:00
Amith Yamasani
1a1a7c0878 am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev
* commit '06a441de3b6756cf49879ff445ac26c66da54d02':
  Pass along the user id to AttributeCache requests
2013-07-12 11:19:24 -07:00
Amith Yamasani
06a441de3b Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 2013-07-12 18:17:09 +00:00
The Android Open Source Project
a4ee3088e7 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f
2013-07-12 07:27:43 -07:00
Hiroaki Kuriyama
1ebf13ef20 PreferenceActivity should not leave message in looper when destroyed
When a PreferenceActivity is destroyed as soon as created,
there is a problematic case that messages for the activity are
sometimes left in the looper even after the activity is destroyed.
For example, by clearing user data of the selecting IME on
Settings apk, com.android.settings.Settings is re-launched
2 times successively. (Destory->Create->Destroy->Create)
Due to the left message, application crash can happen.
(NullPointerException at BackStackRecord.getBreadCrumbTitle())

Two cases have been found to observe this issue.
[Case 1]
 1,Launch IME in advance.
 2,Go to Settings >Apps > All and choose the IME package.
 3,Click "Clear data"
 4,Application crash occurs on com.android.settings.
[Case 2]
 1,Go to Settings > Language&input > Language.
 2,ListView dialog to choose language is shown.
 3,Rotate the tablet 180 degree so that 90 degree rotation occurs twice.
 4,Application crash occurs on com.android.settings.

Change-Id: I5ce36ea7a40ab7bc7737b7dca6641a4c3d77a480
2013-07-12 15:42:35 +09:00
Elliott Hughes
9c8685b714 am f094eefc: am c5de9c35: Merge "Track libcore API update."
* commit 'f094eefc34013c7167effa558b488709eaa54751':
  Track libcore API update.
2013-07-11 18:55:54 -07:00