115840 Commits

Author SHA1 Message Date
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
2013-11-22 11:18:57 -08:00
Robert Greenwalt
ecfae4f899 am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"
* commit 'a4c8fabfbb0bf5bf9da5267c13230c5169b5943d':
  fix ethernet and wifi can't be tuned seperately issue
2013-11-21 18:02:00 -08:00
Robert Greenwalt
a4c8fabfbb Merge "fix ethernet and wifi can't be tuned seperately issue" 2013-11-22 01:57:05 +00:00
Craig Mautner
90192a6165 am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"
* commit '0495f4eded46efd7035ed672dc933ec6430b93fd':
  Make SurfaceView layers captured by screenshotApplications()
2013-11-21 08:50:05 -08:00
Craig Mautner
0495f4eded Merge "Make SurfaceView layers captured by screenshotApplications()" 2013-11-21 16:45:29 +00:00
Sangkyu Lee
7ccba97417 Make SurfaceView layers captured by screenshotApplications()
Since SurfaceView layers are located below application layers,
SurfaceView is not captured by screenshotApplications()
when the application is running in fullscreen.

Moreover, ws.isFullscreen(dw, dh) returns mostly true
on the devices which do not use the navigation bar.

Change-Id: Ia1036c79054950384a97504714929fd85c8147de
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
2013-11-21 15:20:33 +09:00
Jianzheng Zhou
a363a10ca2 fix ethernet and wifi can't be tuned seperately issue
ethernet especially Gigabit enet use the same tune data with wifi
won't reach best performance.

Change-Id: Iac50ba47904c76ff7b5b8ad226e83451359ec534
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-11-15 13:32:23 +08:00
Dianne Hackborn
47b260d071 am 572b759a: Merge "Use index in SparseArray access properly"
* commit '572b759a41fd490fd21b5831dd8b8434b7fd5df8':
  Use index in SparseArray access properly
2013-11-14 16:35:42 -08:00
Dianne Hackborn
572b759a41 Merge "Use index in SparseArray access properly" 2013-11-15 00:33:20 +00:00
Robert Greenwalt
ec9e8933ef am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting"
* commit '3b9244b4b4d5008daa9763a169a751975c75cc54':
  Fix for the invalid Global Proxy Setting
2013-11-13 16:27:56 -08:00
Robert Greenwalt
3b9244b4b4 Merge "Fix for the invalid Global Proxy Setting" 2013-11-14 00:23:04 +00:00
Elliott Hughes
84f4ad8071 am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify."
* commit '87c5eeb48b1a0c498eae9bd2877fb33678d90b8a':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
2013-11-13 15:21:51 -08:00
Elliott Hughes
87c5eeb48b Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." 2013-11-13 23:18:00 +00:00
Elliott Hughes
99f752149b Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
2013-11-13 15:10:40 -08:00
Robert Greenwalt
6eddb39c85 am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService
2013-11-13 10:25:30 -08:00
Robert Greenwalt
18490abd9b Merge "Fix NPE in ConnectivityService" 2013-11-13 18:22:26 +00:00
Ken Mixter
151d3032eb Fix NPE in ConnectivityService
Could occur when requestRouteToHostAddress is called on a network
with no associated tracker.  Code later in the method handles
this case gracefully but code introduced in JB throws an exception.

Change-Id: I6c8a0e313ecbcca120aeb5dd0802a72114749aa1
2013-11-12 22:17:46 -08:00
Igor Chernyshev
b94d654d36 Use index in SparseArray access properly
The original code was calling get() rather than valueAt(),
treating index as if it was a key.

Change-Id: I52539dfcb49b3d2ee3cb027d38c50b46f73b5ee7
Signed-off-by: Igor Chernyshev <igorc@google.com>
2013-11-12 18:56:21 -08:00
Raj Mamadgi
f89fade0cd Fix for the invalid Global Proxy Setting
b/11598568

Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Change-Id: Ib93d24a80af1a329694f07c47bd81dfcc1e1b874
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
2013-11-12 21:14:02 -05:00
Elliott Hughes
221080078a am 01e42c0b: Merge "Fix libinput to build with uapi headers."
* commit '01e42c0be27f492a7325141f509755aa064923f3':
  Fix libinput to build with uapi headers.
2013-11-12 14:55:38 -08:00
Elliott Hughes
01e42c0be2 Merge "Fix libinput to build with uapi headers." 2013-11-12 22:38:50 +00:00
Elliott Hughes
6a2e9bccef Fix libinput to build with uapi headers.
Bug: 11559337
Change-Id: I00ca91162de7cd42e03df23bbe4208e169b2ebfe
2013-11-12 13:16:37 -08:00
Elliott Hughes
ede7f9d3a3 am 9e71310d: Merge "Remove incorrect (and unused) capget code."
* commit '9e71310d15d9dfcbf5e1c94948e0260f3dc3e678':
  Remove incorrect (and unused) capget code.
2013-11-07 23:03:43 -08:00
Elliott Hughes
9e71310d15 Merge "Remove incorrect (and unused) capget code." 2013-11-08 07:01:43 +00:00
Elliott Hughes
42a4bb5730 Remove incorrect (and unused) capget code.
Note that if you revert this change, the code it removes is incorrect,
and doesn't handle the top 32 bits of capabilities, one of which we're
already using: CAP_BLOCK_SUSPEND.

Bug: 11508244
Change-Id: Ice1f51334bce4941c6d24d6016450a2ebcf92886
2013-11-07 22:35:23 -08:00
Chris Craik
6ed16a89d8 am 0b807d2e: Merge "Update the layer\'s alpha value upon composition of the layer"
* commit '0b807d2e74f786af0d44162d92cc0bf85883349a':
  Update the layer's alpha value upon composition of the layer
2013-11-05 17:08:00 -08:00
Chris Craik
0b807d2e74 Merge "Update the layer's alpha value upon composition of the layer" 2013-11-06 01:05:54 +00:00
Brian Carlstrom
c0b2d860ef am 01ac9531: Merge "Treat UnsatisfiedLinkError as non-fatal"
* commit '01ac953180d2ec2a020e1fc82bba8218c0aa4555':
  Treat UnsatisfiedLinkError as non-fatal
2013-11-05 10:08:06 -08:00
Digish Pandya
a5ff739d3c Update the layer's alpha value upon composition of the layer
Fixes: This patch makes sure that the layer's alpha value is
up-to-date and does not reflect the previous view's alpha value.
it fixes the square block on marquee fading edge when text view
is applied transparency.

Change-Id: I110649db72a75fecc02ba56c201a05773f80328c
2013-11-05 09:22:37 +05:30
Brian Carlstrom
01ac953180 Merge "Treat UnsatisfiedLinkError as non-fatal" 2013-11-04 18:06:36 +00:00
Brian Carlstrom
ad13bd5c0d Treat UnsatisfiedLinkError as non-fatal
Bug: 11466297

(cherry picked from commit e92f19e58caa05f5f4086d12a6396116ce6182aa)

Change-Id: I449474078b9f465f1da26a27bf96f9c35d2bb2fc
2013-11-04 09:58:25 -08:00
Christopher Tate
4f33a5d7dd am 1f835093: Merge "Remove parentheses around return statement"
* commit '1f8350935caa6a44ef2608e34d4e3a91db4424a7':
  Remove parentheses around return statement
2013-10-30 12:22:36 -07:00
Christopher Tate
1f8350935c Merge "Remove parentheses around return statement" 2013-10-30 19:19:29 +00:00
Taeho Kim
67ab4bae1d Remove parentheses around return statement
Removed parentheses around return statement in drag-n-drop sample,
which is not part of the Android style.

Change-Id: I09701829b277f2aa84b1fff1c7a8ea8241bdc578
Signed-off-by: Taeho Kim <jyte82@gmail.com>
2013-10-30 20:13:59 +09:00
Elliott Hughes
ee907eaf10 am 91135202: Merge "Always initialize local boolean variables when possible"
* commit '91135202e76a89af4d9bd8f2c30f8f006fbcaf44':
  Always initialize local boolean variables when possible
2013-10-29 17:01:44 -07:00
Elliott Hughes
91135202e7 Merge "Always initialize local boolean variables when possible" 2013-10-29 23:58:30 +00:00
Michael Wright
91c4cd51b4 Always initialize local boolean variables when possible
It's currently possible to reference deviceModeChanged in InputReader
while it's in an unknown state. Change the style of initialization
here and a few other places to better prevent this type of error.

(cherry-pick of f583d0dcc6e5c1968c472c844f6c8fbbe036ad78.)

Bug: 11433748
Change-Id: Ic450ca4afe50987b022db9d20bb1cb18ccf060cc
2013-10-29 16:56:30 -07:00
Christopher Tate
94de60cccc am e431b97c: Merge "Fixed Drag-and-Drop sample code"
* commit 'e431b97c1f1692a42c9a348a5ff930f82eee2537':
  Fixed Drag-and-Drop sample code
2013-10-29 15:05:54 -07:00
Christopher Tate
e431b97c1f Merge "Fixed Drag-and-Drop sample code" 2013-10-29 22:02:06 +00:00
Jeff Brown
145cac85f8 am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage"
* commit '4bf6eb1775649a803efcc6da8f06e5083ed24f34':
  Memory leak in IInputMethodSessionWrapper executeMessage
2013-10-29 14:06:07 -07:00
Jeff Brown
5214dae44c am 6dbbba4e: Merge "handle negative temperature"
* commit '6dbbba4e9adc3f1c2481698e42f4ffc0c68937f1':
  handle negative temperature
2013-10-29 14:02:34 -07:00
Jeff Brown
4bf6eb1775 Merge "Memory leak in IInputMethodSessionWrapper executeMessage" 2013-10-29 21:01:13 +00:00
Jeff Brown
6dbbba4e9a Merge "handle negative temperature" 2013-10-29 20:59:38 +00:00
Elliott Hughes
8f592378a1 am 69920427: Merge "Fix a variety of small publicly-reported bugs."
* commit '69920427ea01421d34f3a7576bdd135527b20859':
  Fix a variety of small publicly-reported bugs.
2013-10-29 13:32:33 -07:00
Elliott Hughes
69920427ea Merge "Fix a variety of small publicly-reported bugs." 2013-10-29 20:30:27 +00:00
Elliott Hughes
c367d48c55 Fix a variety of small publicly-reported bugs.
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556

Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546

Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
2013-10-29 13:12:55 -07:00
Alex Klyubin
5692203998 am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit 'b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
2013-10-29 08:50:28 -07:00
Alex Klyubin
b4cae4a955 Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites." 2013-10-29 15:47:34 +00:00
Taeho Kim
130e1294e8 Fixed Drag-and-Drop sample code
Fixed some erros in 'Responding to drag events' sample code on
http://developer.android.com/guide/topics/ui/drag-drop.html

Changed View.OnDragEventListener to View.OnDragListener,
deleted brace start('{') after DragEvent.ACTION_DRAG_ENTERED which
does not have matching ends, and removed 'break' on each case in
swich statement which causes 'Unreachable code' error.
Added return statement at the 'default' case, so that onDrag() method
can return value in all case.

Change-Id: I7d2335f5c405626e3f0cff275b52818762c84634
Signed-off-by: Taeho Kim <jyte82@gmail.com>
2013-10-29 23:32:16 +09:00
Alex Klyubin
019118af67 Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
The method was returning all supported cipher suites instead of the
default ones only. The default list of cipher suites actually used by
sockets created by this factory is not affected by this issue.

Change-Id: I2e4d7c6547fcb29ff7a0943bc8791706cc8d22bc
2013-10-28 16:24:33 -07:00