OSDN Git Service
Dan Sandler [Wed, 19 Mar 2014 13:04:00 +0000 (13:04 +0000)]
Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev
Dave Platt [Wed, 19 Mar 2014 00:50:29 +0000 (00:50 +0000)]
Merge "Harden NsdManager against null-dereference crashes" into klp-dev
Jeff Brown [Wed, 19 Mar 2014 00:19:38 +0000 (00:19 +0000)]
Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
Xia Wang [Tue, 18 Mar 2014 22:10:32 +0000 (22:10 +0000)]
Merge "Fix state transition verification." into klp-dev
Jeff Brown [Tue, 18 Mar 2014 20:41:31 +0000 (13:41 -0700)]
Refresh cast icon assets to improve visual contrast.
Bug:
13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
Adrian Roos [Tue, 18 Mar 2014 21:03:15 +0000 (21:03 +0000)]
am
1f3186ee: (-s ours) am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
1f3186ee4505997ef3a235f669313236099308f4':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:59:28 +0000 (13:59 -0700)]
am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
67a92975ac638db3d51ea4978cf78ee207fcceb7':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:53:17 +0000 (13:53 -0700)]
am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
88da2bfaacaafebdd2e0fb9542386486b9594871':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:47:58 +0000 (13:47 -0700)]
am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:41:20 +0000 (13:41 -0700)]
am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
500ec9ce4b7856eca480c4c7dca8df1211614102':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:34:05 +0000 (13:34 -0700)]
am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
25fb7133901f6a538d5d365f3c0c1c936e76679d':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:28:17 +0000 (13:28 -0700)]
am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:24:35 +0000 (13:24 -0700)]
am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
d3da8f711ec642322e497a493985bed5c43f597b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:17:12 +0000 (13:17 -0700)]
am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ecba937b005b07d72eadfaf93a200e0b14af2980':
DO NOT MERGE - Fix keyguard pattern lockout bug
Xia Wang [Tue, 4 Mar 2014 19:29:18 +0000 (11:29 -0800)]
Fix state transition verification.
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.
Bug:
13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit
71aae0b6fd1bb9204b81c2e9447f3544c29579c4)
Adrian Roos [Tue, 18 Mar 2014 17:33:14 +0000 (18:33 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit
91c9561cbe665f91e1665f30362c409ae180b127)
Bug:
13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
Dan Sandler [Fri, 14 Mar 2014 18:48:31 +0000 (14:48 -0400)]
DO NOT MERGE: Maintain binding to crashed listeners.
Adapted from change I44ce250e, "Maintain binding to crashed
listeners from NotificationManagerService.":
> This fixes the logic on the death handlers for notification
> listeners, and doesn't unbind from the listener services so
> that the system will bring them back up again.
Bug:
12587702
Change-Id: I41d0c6733046ee9760bcfae4407e754592b805ea
Geoff Mendal [Mon, 17 Mar 2014 16:34:19 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
Craig Mautner [Fri, 14 Mar 2014 22:30:04 +0000 (22:30 +0000)]
Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Marco Nelissen [Fri, 14 Mar 2014 22:27:22 +0000 (22:27 +0000)]
Merge "Verify certificates" into klp-dev
Daniel 2 Olofsson [Tue, 13 Aug 2013 08:30:26 +0000 (10:30 +0200)]
Re-initialize error after attach
If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.
Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
Selim Cinek [Fri, 14 Mar 2014 17:42:48 +0000 (18:42 +0100)]
DO NOT MERGE - Fixed crash for odd image width/height
Due to an internal rounding in the renderer, the calculations
for the cropping area could be slightly offset, getting out
of the image boundaries. I sanitized the rect by ensuring they
are inside the image.
Bug:
12174629
Change-Id: Icc37790732ddd479631b898b23c05501d2dcd5be
Craig Mautner [Fri, 14 Mar 2014 04:09:35 +0000 (21:09 -0700)]
Merge commit '
3b9de0a4' into manualmerge
Conflicts:
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b
Yohei Yukawa [Wed, 5 Mar 2014 05:53:01 +0000 (14:53 +0900)]
DO NOT MERGE - Preserve the order of InputMethodManager method calls
Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520
This CL allows the Framework class InputMethodManager to behave
in a more deterministic way, that is to say, with an I/O barrier.
InputMethodManager#setAdditionalInputMethodSubtypes is internally
implemented as a RPC to the corresponding counterpart in
InputMethodManagerService. The problem here is that this RPC is
marked as "oneway". As a consequence, this public API call
returns immediately without waiting the additional subtypes are
actually added. This behavior is also not documented so far
unfortunately.
See the following demo code:
Final InputMethodManager imm = ...;
imm.setAdditionalInputMethodSubtypes(id, subTypes);
Final List<InputMethodInfo> ims = imm.getInputMethodList();
Currently, it is not guaranteed that the InputMethodInfo returned
from #getInputMethodList reflects the result of the previous call
of #setAdditionalInputMethodSubtypes because of its undocumented
asynchronous nature.
With this CL, InputMethodManager#setAdditionalInputMethodSubtypes
behaves as if it has I/O barrier. This change should make it easy
for IME developers to use additional subtype mechanism.
BUG:
13033954
BUG:
13291370
Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
Craig Mautner [Fri, 14 Mar 2014 02:47:29 +0000 (19:47 -0700)]
am
00e12e61: am
1066fc61: Resolved conflicts for merge of
ad63d914 to jb-mr2-dev
* commit '
00e12e61472d850c00cf1e479fda2b371ead1257':
Show the keyguard if unsecure window on top
Craig Mautner [Fri, 14 Mar 2014 02:40:49 +0000 (19:40 -0700)]
am
1066fc61: Resolved conflicts for merge of
ad63d914 to jb-mr2-dev
* commit '
1066fc61a371443e9423f890f6f7615f2d1e4c6c':
Show the keyguard if unsecure window on top
Craig Mautner [Fri, 14 Mar 2014 00:40:20 +0000 (00:40 +0000)]
Merge "Fix activities appearing behind launcher icons" into klp-dev
Dave Platt [Fri, 14 Mar 2014 00:27:03 +0000 (17:27 -0700)]
Harden NsdManager against null-dereference crashes
Due to race conditions or programming errors, the NsdManager
can attempt to process an asynchronous status message (and issue
a callback to the listener) after the listener has already been
removed from the NsdManager state. This causes dereferencing of
null objects, and a crash.
Split out the three async-queue message cases: these are ones
in which message.arg2 does not hold an NsdManager array index
and the code should not interpret this field as if it were.
Add an explicit check for "null listener" (the array index in the
message has already been released), log a warning, and exit early.
Safeguard accesses to the "NSD service type" string from a possibly
null) NsdServiceInfo object... return a constant "?" string rather
than crashing.
Bug:
9016259
Manual cherrypick of commit
b1fbb14122a99c62363a949dd634294f5e887ef,
change-ID I7a6ff6842cf035cefbafe2a023ae1fd43734081e in master.
Change-Id: I8d9b7a1763d47d061a0f46b3cb453de4bdb8c2ed
Mike Lockwood [Thu, 13 Mar 2014 23:32:17 +0000 (23:32 +0000)]
Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
Craig Mautner [Thu, 13 Mar 2014 23:16:20 +0000 (16:16 -0700)]
Fix activities appearing behind launcher icons
cherry picked from
d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866
Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0
Marco Nelissen [Thu, 13 Mar 2014 21:18:59 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
JP Abgrall [Thu, 13 Mar 2014 20:33:43 +0000 (20:33 +0000)]
Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
Craig Mautner [Thu, 13 Mar 2014 19:35:23 +0000 (12:35 -0700)]
Resolved conflicts for merge of
ad63d914 to jb-mr2-dev
Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
Chad Brubaker [Thu, 13 Mar 2014 18:09:57 +0000 (18:09 +0000)]
Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
Craig Mautner [Thu, 13 Mar 2014 18:01:13 +0000 (11:01 -0700)]
am
20a4f490: am
817f5586: am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
20a4f490957407b9534fc453833de2fe2f276426':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:58:11 +0000 (10:58 -0700)]
am
817f5586: am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
817f5586053ae135a59cd0768980ca741e9215b0':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:55:31 +0000 (10:55 -0700)]
am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
3d958f81c54252b452631ea1bb6e7954fc7066c8':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:51:39 +0000 (10:51 -0700)]
am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
468e8e9873d764c090576d70aebf658e3e89bbfe':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:47:49 +0000 (10:47 -0700)]
am
1f52437d: Show the keyguard if unsecure window on top
* commit '
1f52437de9aa6089a72c7c992f9e7291a6a96115':
Show the keyguard if unsecure window on top
Svetoslav [Thu, 13 Mar 2014 17:26:44 +0000 (17:26 +0000)]
Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
Adrian Roos [Thu, 13 Mar 2014 17:22:58 +0000 (17:22 +0000)]
Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
Baligh Uddin [Thu, 13 Mar 2014 16:22:52 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Adrian Roos [Mon, 10 Mar 2014 16:00:11 +0000 (17:00 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit
7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
Bug:
13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
JP Abgrall [Fri, 21 Feb 2014 20:05:20 +0000 (12:05 -0800)]
ConnectivityService: add support to set TCP initial rwnd
The value for the TCP initial receive window comes from,
in order,
kernel
/proc/sys/net/ipv4/tcp_default_init_rwnd
init.rc (via properties)
net.tcp.default_init_rwnd
properties
net.tcp.default_init_rwnd
gservices
Settings.Global.TCP_DEFAULT_INIT_RWND
Bug:
12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
Dianne Hackborn [Thu, 13 Mar 2014 01:12:13 +0000 (01:12 +0000)]
Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
Jeff Brown [Thu, 13 Mar 2014 00:12:52 +0000 (00:12 +0000)]
Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
Zhihai Xu [Wed, 12 Mar 2014 23:22:37 +0000 (23:22 +0000)]
Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
Zhihai Xu [Sat, 11 Jan 2014 00:44:39 +0000 (16:44 -0800)]
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager.
It cause maximize volume in Bluetooth speaker/device.
The volume expected by Bluetooth Avrcp should be from 0 to 15.
But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150.
It is scaled by 10 times than the correct volume.
index = rescaleIndex(index * 10, streamType, streamTypeAlias);
Should divide the volume by 10 before pass to Bluetooth Avrcp.
bug:
12495379
Change-Id: I4160588e92ee384e21a75d63036d8bd6ccb30621
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
Show the keyguard if unsecure window on top
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.
(cherry picked from commit
ab55e524b89c13082193940a5bf8480a2c2522d9)
Fixes bug
13225149.
Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
Svetoslav [Thu, 2 Jan 2014 19:23:44 +0000 (11:23 -0800)]
PrintSpooler crash if printer is reported to have only one color mode.
bug:
11993304
Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c
(cherry picked from commit
b0d97b87ba5f23ee867f381a4e5916ebb2e5f762)
Dianne Hackborn [Wed, 12 Mar 2014 18:10:08 +0000 (11:10 -0700)]
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
The activity manager needs to set launchedFromPackage to be that of
the previous package in the case where flow has been redirected
through an intermediate activity.
Change-Id: I678fc2e7d984991ac715251a784ba7d7ccbf9fca
Baligh Uddin [Wed, 12 Mar 2014 16:09:05 +0000 (09:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b0385f74777c70bda7e2962777c1c96767bd222
Auto-generated-cl: translation import
Jeff Brown [Wed, 12 Mar 2014 06:02:35 +0000 (23:02 -0700)]
Fix power manager display wake lock bugs. (DO NOT MERGE)
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.
1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.
2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on. This could happen when the display was
rapidly turned on-off-on-off.
Bug:
13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
Jeff Brown [Tue, 11 Mar 2014 04:24:37 +0000 (21:24 -0700)]
Retain display when creating specialized contexts. (DO NOT MERGE)
Fixed a bug that cause Context.createPackageContext() to discard
display information. Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.
As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.
Bug:
12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
Adam Powell [Tue, 11 Mar 2014 23:19:37 +0000 (23:19 +0000)]
Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
Adam Powell [Wed, 4 Dec 2013 19:15:29 +0000 (11:15 -0800)]
Add a config override for ViewConfiguration#hasPermanentMenuKey
Allow device overlays to override the behavior of the
hasPermanentMenuKey method at build time. This is useful for devices
that do not behave as the usual autodetection mechanism expects.
Device overlays should set config_overrideHasPermanentMenuKey to 1 if
the device DOES have a permanent menu key or 2 if the device DOES NOT
have a permanent menu key.
Bug
11698700
Change-Id: I467b68528cf681b08adcaebc2402d8bdd84f6b5c
Narayan Kamath [Mon, 16 Dec 2013 18:18:12 +0000 (18:18 +0000)]
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
We'd otherwise leave the data dirs & native libraries
lying around. This will leave the app permanently broken
because the next install of the app will fail with
INSTALL_FAILED_UID_CHANGED.
Also remove an unnecessary instance variable.
Cherry-pick from master
Bug
13416059
Change-Id: I1e644aab74d5ea519231800915b39c2f55d043ae
Naofumi Harada [Tue, 21 Jan 2014 01:29:36 +0000 (10:29 +0900)]
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Since Kitkat, an app pre-loaded under /system/priv-app/ has
FLAG_PRIVILEGED. However, if the app updated and the device
rebooted, privileged flag is unset from pkgFlags. This patch
fix issue to assign privileged flag when scanning the updated
packages.
Bug:
12640283
Cherrypick from master.
Change-Id: I833d94cd911693c9291e8204f63bd8de945dbba6
Chad Brubaker [Tue, 11 Feb 2014 22:18:56 +0000 (14:18 -0800)]
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
Chad Brubaker [Tue, 11 Mar 2014 17:51:50 +0000 (17:51 +0000)]
Merge "Only allow System apps to make VPN exempt routes" into klp-dev
Chad Brubaker [Tue, 11 Mar 2014 17:51:45 +0000 (17:51 +0000)]
Merge "Add the calling package name to requestRouteToHost" into klp-dev
Christopher Tate [Tue, 11 Mar 2014 17:34:15 +0000 (17:34 +0000)]
Merge "DO NOT MERGE - Don't hang installs if the transport disappears" into klp-dev
Baligh Uddin [Tue, 11 Mar 2014 17:33:28 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:12:13 +0000 (02:12 +0000)]
Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:12:05 +0000 (02:12 +0000)]
Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:11:58 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
Adam Powell [Tue, 11 Mar 2014 01:22:10 +0000 (01:22 +0000)]
Merge "Fix a bug in submenu presenter priority handling" into klp-dev
Christopher Tate [Mon, 3 Mar 2014 20:03:09 +0000 (12:03 -0800)]
DO NOT MERGE - Don't hang installs if the transport disappears
Bug
12991308
Cherry-pick from master.
Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
Mike Lockwood [Mon, 10 Mar 2014 22:58:11 +0000 (15:58 -0700)]
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
Bug:
13393825
Change-Id: Ice0ce47b4bd65e453771d44b17352982335e9ebd
Jason Sams [Mon, 10 Mar 2014 20:32:42 +0000 (13:32 -0700)]
Fix destruction issues relating to AllocationAdapter.
bug
13170046
Change-Id: I2a2ba3cbd7d08c659ed8958fbcc01919e36e86b0
Jason Sams [Mon, 10 Mar 2014 20:32:21 +0000 (13:32 -0700)]
Add hidden minor version ID for support lib workarounds.
bug
13170046
Change-Id: I0c77901752e9a0b10bd5be62311c79a0ab7128e5
Jason Sams [Mon, 10 Mar 2014 20:31:51 +0000 (13:31 -0700)]
Fix destruction issues relating to AllocationAdapter.
bug
13170046
Change-Id: I922b19c086b675949c6fae66c6dcb4c8af3b715f
Robert Greenwalt [Mon, 10 Mar 2014 20:04:09 +0000 (20:04 +0000)]
Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
Baligh Uddin [Mon, 10 Mar 2014 19:36:47 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee9ef4f534076df84a28d70663293dc42b26cb99
Auto-generated-cl: translation import
Zhihai Xu [Mon, 10 Mar 2014 18:46:56 +0000 (18:46 +0000)]
Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
Zhihai Xu [Tue, 7 Jan 2014 19:36:01 +0000 (19:36 +0000)]
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
This reverts commit
371427b53c70d1a71012de404c29187fe303a22a.
bug:
12099469
Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
Vinit Deshapnde [Mon, 10 Mar 2014 17:51:18 +0000 (17:51 +0000)]
Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
Adam Powell [Wed, 4 Dec 2013 02:58:29 +0000 (18:58 -0800)]
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
Wei Wang [Sat, 8 Mar 2014 02:01:01 +0000 (02:01 +0000)]
Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
Robert Greenwalt [Sat, 8 Mar 2014 00:51:41 +0000 (16:51 -0800)]
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
Alan Viverette [Sat, 8 Mar 2014 00:50:24 +0000 (16:50 -0800)]
DO NOT MERGE Quick fix for updating the FastScroller long list property
BUG:
12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
Adam Powell [Fri, 7 Mar 2014 23:28:19 +0000 (23:28 +0000)]
Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
Alan Viverette [Fri, 7 Mar 2014 22:30:11 +0000 (14:30 -0800)]
DO NOT MERGE Check item type before re-binding transient state views
BUG:
12701797
Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20
Marco Nelissen [Fri, 7 Mar 2014 22:49:33 +0000 (22:49 +0000)]
Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
Craig Mautner [Fri, 7 Mar 2014 22:30:25 +0000 (22:30 +0000)]
Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
Elliott Hughes [Wed, 13 Nov 2013 23:10:40 +0000 (15:10 -0800)]
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
Alan Viverette [Fri, 7 Mar 2014 22:08:02 +0000 (14:08 -0800)]
DO NOT MERGE Ensure transient state views are temporarily detached
BUG:
12024471
Change-Id: I02659d65d664b3fd8991a0527bd23801db6f1a9d
Marco Nelissen [Fri, 7 Mar 2014 20:23:29 +0000 (20:23 +0000)]
Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
Vineeta Srivastava [Fri, 7 Mar 2014 20:09:00 +0000 (20:09 +0000)]
Merge "telephony: Add same named operator configuration for some operators" into klp-dev
Sungmin Choi [Fri, 13 Dec 2013 05:50:40 +0000 (14:50 +0900)]
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
Vineeta Srivastava [Fri, 7 Mar 2014 18:37:42 +0000 (18:37 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
Sungmin Choi [Mon, 16 Dec 2013 07:14:44 +0000 (16:14 +0900)]
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
Marco Nelissen [Fri, 10 Jan 2014 18:39:27 +0000 (10:39 -0800)]
Make MtpDatabase use libexif instead of libjhead
b/
12203995
Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Leon Scroggins III [Fri, 7 Mar 2014 18:13:29 +0000 (18:13 +0000)]
Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 18:12:30 +0000 (18:12 +0000)]
Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
Andy McFadden [Fri, 7 Mar 2014 17:40:39 +0000 (17:40 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
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
Leon Scroggins III [Tue, 14 Jan 2014 20:14:57 +0000 (15:14 -0500)]
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
Chris Wren [Fri, 7 Mar 2014 15:08:29 +0000 (15:08 +0000)]
Merge "use relative positioning for notification actions" into klp-dev