Commit Graph

163783 Commits

Author SHA1 Message Date
Jinsuk Kim
56c119abde Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 2015-01-23 21:10:38 +00:00
John Reck
bb8d7ffeae am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev
* commit '94474515e035d726ff24c48233c452ce34ef7c01':
  Prevent memory corruption from use-after-free
2015-01-23 20:29:10 +00:00
John Reck
94474515e0 Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 2015-01-23 20:24:57 +00:00
Miao Wang
1446eb8f61 am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev
* commit '2772ee6d8144bde55464592bb74ad35176425ea7':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
2015-01-23 19:22:48 +00:00
Miao Wang
2772ee6d81 Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 2015-01-23 19:17:13 +00:00
Miao Wang
8a1265384b [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram
Intrinsic

Bug: 19035242
Bug: 19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
2015-01-23 19:15:57 +00:00
John Reck
4018eb3763 Prevent memory corruption from use-after-free
Bug: 19035637

If an app tries to call recycle() on a Bitmap that has
already been finalized it will result in use-after-frees. This is
bad. Avoid this by setting the pointer to 0 and checking for this

Change-Id: I12d73703a0f95b05fe4c2fd8e9c01b6a3f2f023b
2015-01-23 11:01:05 -08:00
Mike Lockwood
7182774810 MTP: Fix partial implementation of 5 new audio specific properties
In change Ic5b3fb75309893caae1a4f4b56068a543847f1f7, we added partial
support for the MTP properties:

MTP_PROPERTY_AUDIO_WAVE_CODE,
MTP_PROPERTY_BITRATE_TYPE
MTP_PROPERTY_AUDIO_BITRATE
MTP_PROPERTY_NUMBER_OF_CHANNELS
MTP_PROPERTY_SAMPLE_RATE

However we were not returning any values for these properties in the result
of the MTP GetObjectPropList command. Strangely, this triggers a nasty bug
in Windows 7 that results in data loss.  When copying a directory containing
several MP3 files from one location on the device to another, Windows will
copy only some of the files to the new location, but delete all of the originals.
Finishing the implementation of these new object properties for some unknown
reason stops this bad behavior in Windows 7.

Bug: 19018427
Change-Id: I5fd3b91a89b31827d3100686445cef6795fe0f3f
2015-01-23 10:58:38 -08:00
Chet Haase
458cc6a515 am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
* commit 'af8c621d2165248cdb60699a6655e56e7dfa2e05':
  Allow infinite-repeat zero-duration animators to continue repeating
2015-01-23 18:04:03 +00:00
Rich Slogar
639248789c docs: plugin for gradle typo
b/19106103

Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
2015-01-23 09:57:37 -08:00
Chet Haase
af8c621d21 Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 2015-01-23 17:56:59 +00:00
Prerepa Viswanadham
76552bb963 am e77adabe: Don\'t compute flags length for scan response
* commit 'e77adabeafa16f9b401a6ad67405205bd96f2219':
  Don't compute flags length for scan response
2015-01-23 17:56:28 +00:00
Prerepa Viswanadham
e77adabeaf Don't compute flags length for scan response
Bug 19041626

Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
2015-01-23 17:51:43 +00:00
Benjamin Franz
f87b174dac Avoid NullPointerException if createUser returns null
If createUser returns null, we run into a NullPointerException
in createAndInitializeUser. This can happen when the policy
DISALLOW_ADD_USER is set.

Bug: 19121141
Change-Id: Id4bda832a243fa42c31eb5a176ecaa248aee68f5
2015-01-23 17:04:16 +00:00
Christoph Studer
9e9885e1c0 am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev
* commit '73500edb42d9270437e41ff2ddaa0cd6eacb422b':
  SysUI: Don't drop HUN notification when clicked
2015-01-23 16:55:31 +00:00
Christoph Studer
73500edb42 Merge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev 2015-01-23 16:51:46 +00:00
Benjamin Franz
bfca5f40eb am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
* commit '266303fdb02ca1cf6df348e1af6830675476fd78':
  Avoid SecurityException when calling getUserData
2015-01-23 14:37:42 +00:00
Benjamin Franz
266303fdb0 Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 2015-01-23 14:33:06 +00:00
Zoltan Szatmary-Ban
871fa7343a Ensure notifications are sent when locking/unlocking location share
When the restriction 'DISALLOW_SHARE_LOCATION' is applied or removed on a user
it is important to send out notifications to content observers of
LOCATION_PROVIDERS_ALLOWED.

Bug: 18995405
Change-Id: I8b3910a423a012ea9d15470eec101723c9f0eaf7
2015-01-23 14:08:30 +00:00
Lorenzo Colitti
50f9d93a1c am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
* commit 'ae38596bcf2a077753d170c0cad68f4dfde4277b':
  Support connecting to networks with misconfigured subnet masks.
2015-01-23 12:56:58 +00:00
Lorenzo Colitti
ae38596bcf Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 2015-01-23 12:50:32 +00:00
Lorenzo Colitti
2dfb79a54a Support connecting to networks with misconfigured subnet masks.
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
2015-01-23 21:10:34 +09:00
Jinsuk Kim
c4228a7281 CEC: Handles initiation of press-and-hold correctly
Previously the time gap between the first and the second key event
for repeated keys(press-and-hold) can be bigger than the threshold,
which violates CEC spec. This CL rectifies it by managing its own
state rather than relying on Android key handler.

Bug: 19117830

Change-Id: Iedfa48f9ab826252e8616d1c3b7491e8b8333c81
2015-01-23 18:20:20 +09:00
Jinsuk Kim
2652c57257 am 3379c1cb: Fix broken build
* commit '3379c1cb62488393c2c49b5f38483656c7175fa1':
  Fix broken build
2015-01-23 08:19:56 +00:00
Jinsuk Kim
3379c1cb62 Fix broken build
Updated system-current.txt

Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
2015-01-23 17:13:50 +09:00
Jinsuk Kim
9ae7d4975c am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
* commit '76cf035513d843c66d2fafe85b6a37c4c19b9223':
  CEC: Add logic to return to internal source
2015-01-23 06:56:24 +00:00
Jinsuk Kim
76cf035513 Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 2015-01-23 06:51:58 +00:00
Lorenzo Colitti
fbaf6b353d am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
* commit '78d51c2292b5a3b56be1b1e92bc67b70f4eebce4':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
2015-01-23 06:03:46 +00:00
Lorenzo Colitti
78d51c2292 Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 2015-01-23 05:57:38 +00:00
Lorenzo Colitti
b205311456 Use the proper IpPrefix and LinkAddress constructors in VPN code.
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.

Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
2015-01-23 14:30:22 +09:00
Matthew Xie
c525cf7a33 Delay the second message for 30ms more than the last message for a2dp
In function setBluetoothA2dpDeviceConnectionState, current code calculate
the delay of the second state update message to be exactly the same as the
last delayed messages. This causes a problem that the sequence of the
messages may be altered.
Bug: 19036411

Change-Id: I35762873fd3341ec098dd229ac96bd42d6f34195
2015-01-22 20:54:54 -08:00
Svetoslav
41fceb462b Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
In accessibility mode we calculate a point where to click in the accessibility
focused view as a bridge-gap solution before switching to accessibility click
actions. We cannot detect whether a view is covered by another one that consumes
all touch events, and therefore we may click on the wrong target. This was the
case with the toolbar. As a result a partially scrolled view in a scrollable
container covered by a toolbar cannot be activated and this is not an edge case.

bug:18986806

Change-Id: Ib41470c39806cec13e9b00b319879cd7f3412ab5
2015-01-22 18:51:47 -08:00
Adam Lesinski
83f58a2f7a Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev
automerge: b443610

* commit 'b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43':
  AAPT: Use the right enum when checking for density configurations
2015-01-23 02:36:39 +00:00
Adam Lesinski
b443610bcb Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev 2015-01-23 02:29:50 +00:00
Adam Lesinski
ed643e8182 AAPT: Use the right enum when checking for density configurations
Bug:19116675
Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
2015-01-22 18:19:44 -08:00
Chet Haase
d15e94f030 Allow infinite-repeat zero-duration animators to continue repeating
A recent change to ValueAnimator caused infinitely repeating animators with
duration 0 to be ended immediately. BatterySaver mode can cause animators
to have 0 duration, which means that apps depending on animator update events
no longer receive those events due to this behavior change.

The fix is to restore the previous behavior of allowing repeating animators
to continue, regardless of duration.

Issue #19113776 Fix infinite-repeating, zero-duration animator behavior

Change-Id: I4d1c7afb6d06ca45ef41db73c160f6a6d5754e24
2015-01-23 02:07:00 +00:00
Rich Slogar
78f75b29fa docs: remove + annotations in version references
b/18417182

Change-Id: I16181a4ebb7a4ac40a7307438e120489b806f24e
2015-01-22 17:48:43 -08:00
Sanket Padawe
b6b29ba45a Remove entries from config_tether_apndata for some carriers.
+ Remove entries from config_tether_apndata when primary carrier requires
DUN apn and the mvno does not.

Bug: 19006861

Change-Id: Idf93fe2302662ce2b25e72277080bbc9d410b2de
2015-01-22 17:43:08 -08:00
Eino-Ville Talvala
0ec0465542 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
automerge: 7fde5e5

* commit '7fde5e5ba3d306bc694e2b97edf5892755fcb6d0':
  Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
2015-01-23 00:08:32 +00:00
Eino-Ville Talvala
7fde5e5ba3 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev 2015-01-23 00:05:26 +00:00
Craig Mautner
5cb31f2179 Merge "Even more debug for bug 17721767." into lmp-mr1-dev
automerge: dbabf37

* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
  Even more debug for bug 17721767.
2015-01-22 23:24:11 +00:00
Craig Mautner
dbabf37fd3 Merge "Even more debug for bug 17721767." into lmp-mr1-dev 2015-01-22 23:17:47 +00:00
Craig Mautner
de313753d0 Even more debug for bug 17721767.
This time adding events for stack movement and focus change.

Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
2015-01-22 14:28:03 -08:00
Ying Wang
abbf8d4194 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2015-01-22 20:41:46 +00:00
Ying Wang
301e1def7a am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev
* commit '24328660c8f4f52647022fd0887978b74d607e06':
  Check in "current" system API files.
2015-01-22 20:41:13 +00:00
Ying Wang
08b7c87881 Merge "Check in "current" system API files." into lmp-mr1-dev
automerge: 2432866

* commit '24328660c8f4f52647022fd0887978b74d607e06':
  Check in "current" system API files.
2015-01-22 20:39:52 +00:00
Ying Wang
24328660c8 Merge "Check in "current" system API files." into lmp-mr1-dev 2015-01-22 20:36:06 +00:00
Ricardo Cervera
0f40077871 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c
automerge: 4386d85

* commit '4386d856a8ced336d08dd82395b52f30d0c122ae':
  docs: Fixes to the watch faces design guidelines
2015-01-22 18:34:20 +00:00
Ricardo Cervera
4386d856a8 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
automerge: 65ab86c

* commit '65ab86cf1ad414612ac57e14f581e0ffb1819e14':
  docs: Fixes to the watch faces design guidelines
2015-01-22 18:27:57 +00:00
Ricardo Cervera
65ab86cf1a am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
* commit '02d093ca675535f1a7f702a9fffd277123cea8ca':
  docs: Fixes to the watch faces design guidelines
2015-01-22 18:02:30 +00:00