114604 Commits

Author SHA1 Message Date
Chad Brubaker
a1d7c74449 Remove SO_BINDTODEVICE from VPN protect
SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
2014-03-11 10:58:19 -07:00
Chad Brubaker
674f85af4c Merge "Only allow System apps to make VPN exempt routes" into klp-dev 2014-03-11 17:51:50 +00:00
Chad Brubaker
decfd7079b Merge "Add the calling package name to requestRouteToHost" into klp-dev 2014-03-11 17:51:45 +00:00
Christopher Tate
e9821bf238 Merge "DO NOT MERGE - Don't hang installs if the transport disappears" into klp-dev 2014-03-11 17:34:15 +00:00
Baligh Uddin
7138395b26 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:33:28 +00:00
Alan Viverette
6e6dc23c69 Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 2014-03-11 02:12:13 +00:00
Alan Viverette
e910a7ce8b Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 2014-03-11 02:12:05 +00:00
Alan Viverette
6a5b7c6ffb Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 2014-03-11 02:11:58 +00:00
Adam Powell
3a153c0de2 Merge "Fix a bug in submenu presenter priority handling" into klp-dev 2014-03-11 01:22:10 +00:00
Christopher Tate
4bda43777c DO NOT MERGE - Don't hang installs if the transport disappears
Bug 12991308

Cherry-pick from master.

Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
2014-03-10 18:07:12 -07:00
Jason Sams
cf8573c154 Fix destruction issues relating to AllocationAdapter.
bug 13170046

Change-Id: I2a2ba3cbd7d08c659ed8958fbcc01919e36e86b0
2014-03-10 13:32:42 -07:00
Jason Sams
5757bf89c4 Add hidden minor version ID for support lib workarounds.
bug 13170046

Change-Id: I0c77901752e9a0b10bd5be62311c79a0ab7128e5
2014-03-10 13:32:21 -07:00
Jason Sams
ff7256e757 Fix destruction issues relating to AllocationAdapter.
bug 13170046

Change-Id: I922b19c086b675949c6fae66c6dcb4c8af3b715f
2014-03-10 13:31:51 -07:00
Robert Greenwalt
6d9ed0c353 Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev 2014-03-10 20:04:10 +00:00
Baligh Uddin
fafc1ce9f8 Import translations. DO NOT MERGE
Change-Id: Iee9ef4f534076df84a28d70663293dc42b26cb99
Auto-generated-cl: translation import
2014-03-10 12:36:47 -07:00
Zhihai Xu
82ec144248 Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 2014-03-10 18:46:56 +00:00
Zhihai Xu
7434fa31d8 DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
This reverts commit 371427b53c70d1a71012de404c29187fe303a22a.

bug:12099469
Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
2014-03-10 10:58:14 -07:00
Vinit Deshapnde
5243a76045 Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev 2014-03-10 17:51:19 +00:00
Adam Powell
190909f2c1 Fix a bug in submenu presenter priority handling
Now that overflow menus and the PhoneWindow-level ListMenuPresenter
can coexist, make sure that ListMenuPresenter handles submenus spawned
by itself. Introduce an internal API for menus to prefer a specific
presenter when performing item actions.

Bug 11979407

Change-Id: Id0b8fcbb8b310cbb3a63a1e5ea7a89de5d53f86f
2014-03-10 10:30:59 -07:00
Wei Wang
1327e59f36 Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 2014-03-08 02:01:02 +00:00
Robert Greenwalt
fcbced38a6 DO NOT MERGE Debounce wifi country code Info
We're getting signals from the radio and it sometimes drops out for
a while.  This change will delay applying an empty country code
for 15sec but apply non-empty country codes immediately.  It uses a
sequence number so we only apply the most recent change, even if
it's delayed.

Also secures the wifi call to set the country code as we can't
allow apps to set it willy-nilly.

bug:11062898
Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a
2014-03-07 16:54:58 -08:00
Alan Viverette
bca20aaf0e DO NOT MERGE Quick fix for updating the FastScroller long list property
BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
2014-03-07 16:50:24 -08:00
Adam Powell
f175b19aaa Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 2014-03-07 23:28:19 +00:00
Alan Viverette
df262cd922 DO NOT MERGE Check item type before re-binding transient state views
BUG: 12701797
Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20
2014-03-07 15:20:13 -08:00
Marco Nelissen
57a45f22ea Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 2014-03-07 22:49:33 +00:00
Craig Mautner
93df07a1b7 Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 2014-03-07 22:30:26 +00:00
Elliott Hughes
0bb17193cc Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
2014-03-07 14:10:52 -08:00
Alan Viverette
e8d2846fb9 DO NOT MERGE Ensure transient state views are temporarily detached
BUG: 12024471
Change-Id: I02659d65d664b3fd8991a0527bd23801db6f1a9d
2014-03-07 14:08:02 -08:00
Marco Nelissen
9823a170e4 Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 2014-03-07 20:23:29 +00:00
Vineeta Srivastava
dbeb0c1295 Merge "telephony: Add same named operator configuration for some operators" into klp-dev 2014-03-07 20:09:00 +00:00
Sungmin Choi
5d37e0d1b4 telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
2014-03-07 11:29:18 -08:00
Vineeta Srivastava
ef86ff5817 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 2014-03-07 18:37:42 +00:00
Sungmin Choi
22ec0dc353 Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
2014-03-07 18:37:26 +00:00
Marco Nelissen
aefa427c27 Make MtpDatabase use libexif instead of libjhead
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
2014-03-07 10:30:23 -08:00
Leon Scroggins III
bc57651fb5 Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 2014-03-07 18:13:29 +00:00
Dianne Hackborn
785d764bd5 Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 2014-03-07 18:12:30 +00:00
Andy McFadden
faddd77a91 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2014-03-07 17:40:40 +00:00
Craig Mautner
2c82c08a54 Show the keyguard if unsecure window on top. DO NOT MERGE.
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
2014-03-07 09:09:27 -08:00
Leon Scroggins III
278250dafb DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
   The old behavior would have continued to modify the
   file descriptor's offset each time a new decode was
   required. The copy ensures that the file descriptor
   remains unchanged.
3. Buffer the file stream.
   Prior to this change, if the image was not a PNG,
   the stream would be rewound to the beginning of the
   file, even if the file descriptor was passed in with
   an offset. Thanks to the buffer, the stream is only
   rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
2014-03-07 11:28:44 -05:00
Chris Wren
70d5ed2692 Merge "use relative positioning for notification actions" into klp-dev 2014-03-07 15:08:29 +00:00
Adam Powell
c9e5f540a9 Fix a bug where OnTouchListeners in action views could be removed
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
2014-03-06 17:57:05 -08:00
Dianne Hackborn
cb15c7a83b More on issue #12031685 (DO NOT MERGE)
Integrate from master:

Fix issue #13065185: Frequent runtime restarts on launching...

..."Hill Climb Racing" app

A service is in use when it is in the restarting state.

Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
2014-03-06 17:39:11 -08:00
Marco Nelissen
98a6bcf433 Merge "ExifInterface: fix class load failure" into klp-dev 2014-03-07 01:16:50 +00:00
Dianne Hackborn
430652c1e1 Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 2014-03-07 01:04:50 +00:00
Zhijun He
9f97ac433a ExifInterface: fix class load failure
libexif_jni was renamed as libjhead_jni

b/12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
2014-03-06 16:54:05 -08:00
Svetoslav
8cb232cb79 Merge "ProgressBar is important for accessibility by default." into klp-dev 2014-03-07 00:37:14 +00:00
Marco Nelissen
e29c96e7ae Merge "libexif is now libjhead" into klp-dev 2014-03-07 00:34:36 +00:00
Marco Nelissen
c0786cc258 libexif is now libjhead
b/12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
2014-03-06 16:00:35 -08:00
Jay Shrauner
a3ea4be542 Prevent SpellChecker from setting invalid range - DO NOT MERGE
Add check for invalid range before setting for further check
at end of parse() loop.

Bug:12936072
Change-Id: Ie0b33b8e69fe47e5d3371640be5681f13a4e4f6e
(cherry picked from commit ea4adf28474d949c51518a5abe6dbd3a3529cf29)
2014-03-06 22:29:12 +00:00
Takahiro Aizawa
092759f6b4 EGL14.eglCreateWindowSurface should set producerControlledByApp
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

Bug 13226025
(cherry-pick from AOSP Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0)

Change-Id: I853484c38f065d71b365bb48b2a794ca4787e70a
2014-03-06 14:18:44 -08:00