OSDN Git Service
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
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
Chad Brubaker [Thu, 13 Mar 2014 18:09:57 +0000 (18:09 +0000)]
Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
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
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
Adam Powell [Fri, 10 Jan 2014 18:16:27 +0000 (10:16 -0800)]
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
Dianne Hackborn [Fri, 7 Mar 2014 01:39:11 +0000 (17:39 -0800)]
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
Marco Nelissen [Fri, 7 Mar 2014 01:16:49 +0000 (01:16 +0000)]
Merge "ExifInterface: fix class load failure" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 01:04:50 +0000 (01:04 +0000)]
Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
Zhijun He [Fri, 20 Dec 2013 21:28:00 +0000 (13:28 -0800)]
ExifInterface: fix class load failure
libexif_jni was renamed as libjhead_jni
b/
12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
Svetoslav [Fri, 7 Mar 2014 00:37:14 +0000 (00:37 +0000)]
Merge "ProgressBar is important for accessibility by default." into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 00:34:36 +0000 (00:34 +0000)]
Merge "libexif is now libjhead" into klp-dev
Marco Nelissen [Thu, 19 Dec 2013 22:21:19 +0000 (14:21 -0800)]
libexif is now libjhead
b/
12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
Jay Shrauner [Fri, 7 Feb 2014 21:28:59 +0000 (13:28 -0800)]
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)
Takahiro Aizawa [Wed, 11 Dec 2013 10:22:26 +0000 (19:22 +0900)]
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
Leon Scroggins III [Wed, 15 Jan 2014 19:23:14 +0000 (14:23 -0500)]
DO NOT MERGE - Fix Javadoc build break.
Remove links to non-specific function name.
Bug:
13246311
Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit
2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
Chris Wren [Tue, 3 Dec 2013 19:31:01 +0000 (14:31 -0500)]
use relative positioning for notification actions
Bug:
10531101
Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d
Leon Scroggins III [Thu, 6 Mar 2014 19:37:28 +0000 (19:37 +0000)]
Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
Svetoslav [Mon, 13 Jan 2014 23:25:58 +0000 (15:25 -0800)]
ProgressBar is important for accessibility by default.
If a view does not have callbacks, or content description, or does not draw
content, and it is marked as important for accessibility auto, then the system
decides it is not important and does not report it. Apparently progress bar
draws content that means something and it should be important for accessibility
by default.
Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
(cherry picked from commit
7face75f2c655a371a4dcdf6063886f92c637ce4)
Eric Laurent [Thu, 6 Mar 2014 19:21:26 +0000 (19:21 +0000)]
Merge "Fix RemoteController synchronization mode" into klp-dev
Dianne Hackborn [Thu, 6 Mar 2014 18:52:05 +0000 (10:52 -0800)]
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
...broadcasted repeatedly at every boot time
Remember the last done pre-boot receivers, so that if we have
a new pre boot receiver appearing (without the platform version
changing), when we re-write the file of done receivers it will
contain all of them, not just the new one.
Change-Id: I4ed3478edc549d4b023ec4b3719111bc4d970ae4
Wei Wang [Wed, 30 Oct 2013 04:05:37 +0000 (21:05 -0700)]
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Add bluetooth adv data, APIs in BluetoothAdpater etc.
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
Dianne Hackborn [Thu, 6 Mar 2014 18:29:19 +0000 (18:29 +0000)]
Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
Dianne Hackborn [Mon, 2 Dec 2013 18:04:42 +0000 (10:04 -0800)]
Fix issue #
11536426 DO NOT MERGE
Permission denied when trying to launch an activity from a notification
We don't remove pending intents when updating an app, which is necessary
to keep app widgets and other things working. However, when uninstalling
an app, we should clear out all of its pending intents.
Change-Id: I95067b31098115b5a7b127766fd093750063bbb8
Santos Cordon [Tue, 4 Mar 2014 00:06:54 +0000 (16:06 -0800)]
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
bug:
12175514
Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
(cherry picked from commit
b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)
Jean-Michel Trivi [Thu, 2 Jan 2014 23:08:26 +0000 (15:08 -0800)]
Fix RemoteController synchronization mode
Fix erroneous argument check in RemoteController syncrhonization
mode setter..
Bug
12189375
Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10
Leon Scroggins III [Tue, 3 Dec 2013 21:26:51 +0000 (16:26 -0500)]
Update framework to use M33 Skia. DO NOT MERGE
(These CLs are already in master.)
Bug:
13246311
This cherry-picks 7 CLs:
-----------------------------------------------------------------------
Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.
Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.
cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
-----------------------------------------------------------------------
Merge AssetStream with AssetStreamAdaptor.
Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.
The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
the length (read(NULL, 0)) is no longer implemented, since it is
no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
so some implementation is necessary.
cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56
-----------------------------------------------------------------------
Deprecate Android-specific SkPaint functions.
The following functions were problematic:
const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
const void* findImage(const SkGlyph&, const SkMatrix*);
Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.
Bug:
11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08
-----------------------------------------------------------------------
pass SkGlyphCache into updateGlyphCache()
Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.
Bug:
11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89
-----------------------------------------------------------------------
Updates to the Skia API needed to merge the WebView m33 version of Skia.
cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3
Bugfix for screenshots (recent apps) due to incorrect rowBytes computation
bug:
12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714
-----------------------------------------------------------------------
Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.
cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5
-----------------------------------------------------------------------
Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
Baligh Uddin [Thu, 6 Mar 2014 17:00:46 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Santos Cordon [Thu, 6 Mar 2014 01:54:20 +0000 (01:54 +0000)]
Merge "Update permission description string." into klp-dev
Vinit Deshapnde [Thu, 6 Mar 2014 01:14:49 +0000 (17:14 -0800)]
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
This change fixes two problems - first, if you rebooted phone after
turning on Airplane mode, Wifi controller goes to ScanOnly mode which
may end up in Wifi radio transmissions. Secondly, because of this
incorrect state, the state machine doesn't turn on Wifi once Airplane
mode is turned off.
bug:
11409692
Change-Id: I55b4a5352a72a9c783e1b9891dd5363434585fb0
Michael Wright [Thu, 6 Mar 2014 00:50:15 +0000 (00:50 +0000)]
Merge "Revert Japanese special case fallback keys." into klp-dev
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:34 +0000 (00:29 +0000)]
Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:20 +0000 (00:29 +0000)]
Merge "Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
Dirk Dougherty [Mon, 3 Mar 2014 22:05:21 +0000 (14:05 -0800)]
Update permission description string.
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit
08d7c2861fee205a314c3847ab5f5894617a233b)
Chad Brubaker [Fri, 14 Feb 2014 21:24:29 +0000 (13:24 -0800)]
Only allow System apps to make VPN exempt routes
requestRouteToHost will only allow system applications to make routes
exempt from the VPN's routing rules.
If a VPN is currently running and a non-system app requests a route it
will only succeed if that host is currently covered by a VPN exempt
routing rule. Otherwise it will fail.
For example, if a VPN is running and the MMS network is brought online
those routes will be added as VPN exempt. If an application then tries
to request a route to a MMS endpoint it will succeed because the routes
already exist. If an application tries to request a route to a host
covered by the VPN the call will fail.
Bug:
12937545
Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
Chad Brubaker [Fri, 14 Feb 2014 21:22:34 +0000 (13:22 -0800)]
Add the calling package name to requestRouteToHost
The calling package name will be used to check if an application is a
system application when deciding if a route should be exempt from VPN
routing rules.
Bug:
12937545
Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405
Dianne Hackborn [Fri, 17 Jan 2014 21:29:21 +0000 (13:29 -0800)]
Issue #
13308712: Add --checkin to package manager dump.
Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233
Fabrice Di Meglio [Tue, 10 Dec 2013 00:40:14 +0000 (16:40 -0800)]
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)
Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783
Fabrice Di Meglio [Tue, 7 Jan 2014 00:30:43 +0000 (16:30 -0800)]
Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
- force TextView internal layout recreation when its TextDirection is changed
Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
(cherry picked from commit
22228fec05129af9684f95d7a13aeff92144bd90)
Robert Greenwalt [Wed, 5 Mar 2014 18:23:56 +0000 (18:23 +0000)]
Merge "Only apply tcp buffer sizes for default net" into klp-dev
Baligh Uddin [Wed, 5 Mar 2014 17:58:27 +0000 (09:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
Auto-generated-cl: translation import
Christopher Tate [Wed, 5 Mar 2014 00:51:32 +0000 (00:51 +0000)]
Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
Christopher Tate [Wed, 5 Mar 2014 00:51:04 +0000 (00:51 +0000)]
Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev