OSDN Git Service
Yorke Lee [Mon, 26 Jan 2015 21:57:35 +0000 (21:57 +0000)]
am
6d4a6845: Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev automerge:
8df7f43
* commit '
6d4a68457c957e2c35940dbf630ea47900700e03':
Update system-api for new getLine1Number() method.
Yorke Lee [Mon, 26 Jan 2015 21:52:24 +0000 (21:52 +0000)]
Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
automerge:
8df7f43
* commit '
8df7f4368425f24f46bb8605dd3d1e3d3b97e6ad':
Update system-api for new getLine1Number() method.
Yorke Lee [Mon, 26 Jan 2015 21:47:55 +0000 (21:47 +0000)]
Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
Sarah Maddox [Mon, 26 Jan 2015 20:42:57 +0000 (20:42 +0000)]
am
83f40802: am
95226c98: am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs automerge:
f31eb13
automerge:
1c10480
* commit '
1c104802f9295afa565e0d62edac5f26b21b9916':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Sarah Maddox [Mon, 26 Jan 2015 20:39:27 +0000 (20:39 +0000)]
am
83f40802: am
95226c98: am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
automerge:
f31eb13
* commit '
f31eb13b8ef5dbdf82955ca52eb74cd6fc5cff47':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Nancy Chen [Mon, 26 Jan 2015 20:35:35 +0000 (12:35 -0800)]
Update system-api for new getLine1Number() method.
Add new method in TelecomManager to system-current.txt.
Bug:
19087382
Change-Id: Id6db61fed45301cc1a15ded6e362d7858f24a273
Sarah Maddox [Mon, 26 Jan 2015 20:35:06 +0000 (20:35 +0000)]
am
83f40802: am
95226c98: am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '
83f40802148e922d78222ffc56377534b8ee92be':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Sarah Maddox [Mon, 26 Jan 2015 20:30:14 +0000 (20:30 +0000)]
am
95226c98: am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '
95226c981b4e14a900f7c4224534d370aeb1ca60':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Sarah Maddox [Mon, 26 Jan 2015 20:23:25 +0000 (20:23 +0000)]
am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '
912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Sarah Maddox [Mon, 26 Jan 2015 20:12:21 +0000 (20:12 +0000)]
Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
Craig Mautner [Mon, 26 Jan 2015 20:11:58 +0000 (20:11 +0000)]
am
8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
automerge:
afc6d33
* commit '
afc6d332790166943302f051d32ec0874d9280aa':
Add reason string for bringing stack to front
Craig Mautner [Mon, 26 Jan 2015 20:09:48 +0000 (20:09 +0000)]
am
8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
* commit '
8995e140ad557c9f3f4667becbaaf0ba4c667638':
Add reason string for bringing stack to front
Craig Mautner [Mon, 26 Jan 2015 20:05:44 +0000 (20:05 +0000)]
Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
Ricardo Cervera [Mon, 26 Jan 2015 20:04:03 +0000 (20:04 +0000)]
am
ba70d548: am
9c9dc80a: am
df07000e: am
d064ce7e: am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
ba70d548cb3fa700e5d11c4afae7d0e9a5f45bd9':
docs: Wear DataItem listener improvements
Ricardo Cervera [Mon, 26 Jan 2015 19:57:37 +0000 (19:57 +0000)]
am
9c9dc80a: am
df07000e: am
d064ce7e: am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
9c9dc80a08d7a9c9f8b6619b7b856c113a94b938':
docs: Wear DataItem listener improvements
Nancy Chen [Mon, 26 Jan 2015 19:54:32 +0000 (19:54 +0000)]
am
42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev
automerge:
f55d132
* commit '
f55d132ae02529afe962544a1200a91bc3440e12':
Add method in TelecomManager to return line1Number for a PhoneAccount.
Ricardo Cervera [Mon, 26 Jan 2015 19:51:53 +0000 (19:51 +0000)]
am
df07000e: am
d064ce7e: am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
df07000e356dee84de9f4dcdd22a15e26e32f684':
docs: Wear DataItem listener improvements
Nancy Chen [Mon, 26 Jan 2015 19:51:14 +0000 (19:51 +0000)]
am
42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev
* commit '
42d45bb1e3e71c19cd977b799ab0fd983e40647f':
Add method in TelecomManager to return line1Number for a PhoneAccount.
Ricardo Cervera [Mon, 26 Jan 2015 19:45:33 +0000 (19:45 +0000)]
am
d064ce7e: am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
d064ce7e8b4ef75c07b99d466c85ea55ef2f4163':
docs: Wear DataItem listener improvements
Nancy Chen [Mon, 26 Jan 2015 19:44:53 +0000 (19:44 +0000)]
Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev
Ricardo Cervera [Mon, 26 Jan 2015 19:39:48 +0000 (19:39 +0000)]
am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
docs: Wear DataItem listener improvements
Ricardo Cervera [Mon, 26 Jan 2015 19:32:12 +0000 (19:32 +0000)]
Merge "docs: Wear DataItem listener improvements" into lmp-docs
Alan Viverette [Mon, 26 Jan 2015 19:29:31 +0000 (19:29 +0000)]
am
e1eff7aa: am
de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
* commit '
e1eff7aadeb0c9f6cc51f07166accd63710ea2c5':
Prevent drag-to-open from cycling pressed state, propagate hotspot
Alan Viverette [Mon, 26 Jan 2015 19:23:27 +0000 (19:23 +0000)]
am
de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
* commit '
de8d28405538128fad55e34dc7c74fd49a909ae6':
Prevent drag-to-open from cycling pressed state, propagate hotspot
Alan Viverette [Mon, 26 Jan 2015 19:16:39 +0000 (19:16 +0000)]
Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
Mike Lockwood [Mon, 26 Jan 2015 19:10:44 +0000 (19:10 +0000)]
am
5ac22aa6: am
2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev
* commit '
5ac22aa60f773917981f42e64fbc28615871fd3e':
MTP: Fix partial implementation of 5 new audio specific properties
Sarah Maddox [Sun, 30 Nov 2014 22:08:26 +0000 (09:08 +1100)]
docs: Adds new geocoding sample to Location API training.
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Bug:
17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
Mike Lockwood [Mon, 26 Jan 2015 18:59:46 +0000 (18:59 +0000)]
am
2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev
* commit '
2b144a16f6ecb054f35a4836e92be39365688fe0':
MTP: Fix partial implementation of 5 new audio specific properties
Craig Mautner [Mon, 26 Jan 2015 17:47:33 +0000 (09:47 -0800)]
Add reason string for bringing stack to front
Additional debug and useful information.
Also removed am_resume_activity verbosity and refactored method to
eliminate unused parameter.
For bug
17721767.
Change-Id: Ie1c0652a38a0c6ae6db27a52a9e5da29e252e300
Mike Lockwood [Mon, 26 Jan 2015 18:52:38 +0000 (18:52 +0000)]
Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev
Alan Viverette [Mon, 26 Jan 2015 18:24:08 +0000 (10:24 -0800)]
Prevent drag-to-open from cycling pressed state, propagate hotspot
Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.
Bug:
19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a
Geoff Mendal [Mon, 26 Jan 2015 16:50:02 +0000 (16:50 +0000)]
am
3ec4af9f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
3ec4af9ff66b2a25e08916726486583f0c36b485':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 16:43:15 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 26 Jan 2015 16:16:08 +0000 (08:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7aa8aacfd6c1e583c5a9404cdb4900a1a6ab7b74
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Jan 2015 14:29:37 +0000 (14:29 +0000)]
am
ca922bb4: (-s ours) am
d57adbbc: (-s ours) Import translations. DO NOT MERGE
* commit '
ca922bb455f2351bc3e31bf0b4d8da2c9a58afe6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 14:23:11 +0000 (14:23 +0000)]
am
d57adbbc: (-s ours) Import translations. DO NOT MERGE
* commit '
d57adbbc4f2f8ccd8fc4a4de0508a8243ace3866':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 14:16:38 +0000 (08:16 -0600)]
Import translations. DO NOT MERGE
Change-Id: If6bad1c33638d232a6f320637ac0e13c8a67adfb
Auto-generated-cl: translation import
Alexandra Gherghina [Mon, 26 Jan 2015 12:11:09 +0000 (12:11 +0000)]
am
1a4802b9: am
abaf69dd: Merge "Update badge assets" into lmp-mr1-dev
* commit '
1a4802b9312886c0323958e1c1008de16d5f18c7':
Update badge assets
Alexandra Gherghina [Mon, 26 Jan 2015 12:05:36 +0000 (12:05 +0000)]
am
abaf69dd: Merge "Update badge assets" into lmp-mr1-dev
* commit '
abaf69dd195aa55c151ab16730e9511539ed46e5':
Update badge assets
Alexandra Gherghina [Mon, 26 Jan 2015 11:59:20 +0000 (11:59 +0000)]
Merge "Update badge assets" into lmp-mr1-dev
Benjamin Franz [Mon, 26 Jan 2015 10:59:45 +0000 (10:59 +0000)]
am
6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev
automerge:
2805669
* commit '
2805669954b70b918d7b24f6695c4da85d6f88e8':
Avoid NullPointerException if createUser returns null
Benjamin Franz [Mon, 26 Jan 2015 10:55:14 +0000 (10:55 +0000)]
am
6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev
* commit '
6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd':
Avoid NullPointerException if createUser returns null
Zoltan Szatmary-Ban [Mon, 26 Jan 2015 10:49:53 +0000 (10:49 +0000)]
am
059b8ab6: am
414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev
* commit '
059b8ab6a9444b1dbdfcdc1df50485dfac7adafa':
Ensure notifications are sent when locking/unlocking location share
Benjamin Franz [Mon, 26 Jan 2015 10:49:47 +0000 (10:49 +0000)]
Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev
Zoltan Szatmary-Ban [Mon, 26 Jan 2015 10:41:00 +0000 (10:41 +0000)]
am
414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev
* commit '
414ea81ea364d7b961cbfb885c30729595e3a7b2':
Ensure notifications are sent when locking/unlocking location share
Alexandra Gherghina [Mon, 26 Jan 2015 09:36:48 +0000 (09:36 +0000)]
Update badge assets
Bug:
18829152
Change-Id: I26936dc528b8d56e37eb02fa04177ad3f225b007
Zoltan Szatmary-Ban [Mon, 26 Jan 2015 10:36:12 +0000 (10:36 +0000)]
Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev
Elliott Hughes [Sun, 25 Jan 2015 19:27:25 +0000 (19:27 +0000)]
Merge "Add missing <string.h> includes." automerge:
82a1a2c
automerge:
86b48b3
* commit '
86b48b3f8056a8efa6857d87dd4f30495e8b0464':
Add missing <string.h> includes.
Elliott Hughes [Sun, 25 Jan 2015 19:21:31 +0000 (19:21 +0000)]
Merge "Add missing <string.h> includes."
automerge:
82a1a2c
* commit '
82a1a2c63959adc0c7e3208c6ffa6985a346ae57':
Add missing <string.h> includes.
Elliott Hughes [Sun, 25 Jan 2015 19:17:42 +0000 (19:17 +0000)]
Merge "Add missing <string.h> includes."
Elliott Hughes [Sun, 25 Jan 2015 16:33:36 +0000 (08:33 -0800)]
Add missing <string.h> includes.
Change-Id: I188bfe1388fa49f6f79d247aa0d0f4fb089de503
Nancy Chen [Sun, 25 Jan 2015 07:30:27 +0000 (23:30 -0800)]
Add method in TelecomManager to return line1Number for a PhoneAccount.
Since we do not want to expose SubIds in the app layer, we need a
wrapper to extra the subId from a PhoneAccount and return the
value of TelephonyManager#line1Number.
Also update error strings to be more consistent.
Bug:
19087382
Change-Id: Ie5a474d45336921d1007b36a4d26cd4da68f8b91
Sanket Padawe [Sat, 24 Jan 2015 00:06:34 +0000 (00:06 +0000)]
am
b0b28059: Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev automerge:
c309688
* commit '
b0b28059b00fa17899e22b0a75310c9348186223':
Remove entries from config_tether_apndata for some carriers.
Sanket Padawe [Sat, 24 Jan 2015 00:00:58 +0000 (00:00 +0000)]
Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev
automerge:
c309688
* commit '
c309688bfaf204c892635783aad96443a41fdffb':
Remove entries from config_tether_apndata for some carriers.
Sanket Padawe [Fri, 23 Jan 2015 23:54:46 +0000 (23:54 +0000)]
Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev
Svetoslav [Fri, 23 Jan 2015 23:31:38 +0000 (23:31 +0000)]
Accessibility: Sometimes cannot interact with nav bar items. automerge:
10a053e
automerge:
db1983b
* commit '
db1983b3f43e86acbf188961f53af794cce05219':
Accessibility: Sometimes cannot interact with nav bar items.
Svetoslav [Fri, 23 Jan 2015 23:27:34 +0000 (23:27 +0000)]
Accessibility: Sometimes cannot interact with nav bar items.
automerge:
10a053e
* commit '
10a053e474e2a566b49a1e4c9e2ec4c8cc0013bd':
Accessibility: Sometimes cannot interact with nav bar items.
Svetoslav [Fri, 23 Jan 2015 22:40:52 +0000 (14:40 -0800)]
Accessibility: Sometimes cannot interact with nav bar items.
If there is a window with the accessibility focus we want to click
on the accessibility focused view in this window. The logic to
compute the bounds of the window was using the wrong window id,
hence getting an incorrect result. As a consequence in some cases
the user could not click on accessiiblity focused controls in the
nav bar.
bug:
18889611
Change-Id: I89aee3ae2ffe27fe29819049c287a7155154c65b
Svetoslav [Fri, 23 Jan 2015 22:30:46 +0000 (22:30 +0000)]
am
42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
automerge:
6e9f276
* commit '
6e9f276ff1554b59692a1820f60217307460308b':
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
Svetoslav [Fri, 23 Jan 2015 22:27:04 +0000 (22:27 +0000)]
am
42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
* commit '
42a13865a4527aaf907a6ced96f726b49b2cbbed':
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
Svetoslav [Fri, 23 Jan 2015 22:22:17 +0000 (22:22 +0000)]
Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
Jinsuk Kim [Fri, 23 Jan 2015 21:20:46 +0000 (21:20 +0000)]
am
56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev
automerge:
ca1384d
* commit '
ca1384dc5abb2d29906310fd577c5ed6fba25f24':
CEC: Handles initiation of press-and-hold correctly
Jinsuk Kim [Fri, 23 Jan 2015 21:16:48 +0000 (21:16 +0000)]
am
56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev
* commit '
56c119abde951146951e3887796eb64ee05d25d3':
CEC: Handles initiation of press-and-hold correctly
Jinsuk Kim [Fri, 23 Jan 2015 21:10:37 +0000 (21:10 +0000)]
Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev
John Reck [Fri, 23 Jan 2015 20:33:18 +0000 (20:33 +0000)]
am
94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev
automerge:
bb8d7ff
* commit '
bb8d7ffeae187e8782a9494e252e335db537b2a1':
Prevent memory corruption from use-after-free
John Reck [Fri, 23 Jan 2015 20:29:10 +0000 (20:29 +0000)]
am
94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev
* commit '
94474515e035d726ff24c48233c452ce34ef7c01':
Prevent memory corruption from use-after-free
John Reck [Fri, 23 Jan 2015 20:24:56 +0000 (20:24 +0000)]
Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev
Miao Wang [Fri, 23 Jan 2015 19:34:48 +0000 (19:34 +0000)]
am
2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev
automerge:
1446eb8
* commit '
1446eb8f6130e4833ca2b74331b867d30445aca3':
[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
Miao Wang [Fri, 23 Jan 2015 19:22:48 +0000 (19:22 +0000)]
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
Miao Wang [Fri, 23 Jan 2015 19:17:11 +0000 (19:17 +0000)]
Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev
Miao Wang [Fri, 23 Jan 2015 17:41:04 +0000 (09:41 -0800)]
[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram
Intrinsic
Bug:
19035242
Bug:
19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
John Reck [Fri, 23 Jan 2015 18:57:15 +0000 (10:57 -0800)]
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
Mike Lockwood [Fri, 23 Jan 2015 18:50:08 +0000 (10:50 -0800)]
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
Chet Haase [Fri, 23 Jan 2015 18:07:14 +0000 (18:07 +0000)]
am
af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
automerge:
458cc6a
* commit '
458cc6a51567677e8a4d1012d3ac89ae57c4daf7':
Allow infinite-repeat zero-duration animators to continue repeating
Chet Haase [Fri, 23 Jan 2015 18:04:03 +0000 (18:04 +0000)]
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
Prerepa Viswanadham [Fri, 23 Jan 2015 18:01:54 +0000 (18:01 +0000)]
am
76552bb9: am
e77adabe: Don\'t compute flags length for scan response
* commit '
76552bb96398e03b21c7d88a302a6ffb59641c16':
Don't compute flags length for scan response
Chet Haase [Fri, 23 Jan 2015 17:56:57 +0000 (17:56 +0000)]
Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
Prerepa Viswanadham [Fri, 23 Jan 2015 17:56:28 +0000 (17:56 +0000)]
am
e77adabe: Don\'t compute flags length for scan response
* commit '
e77adabeafa16f9b401a6ad67405205bd96f2219':
Don't compute flags length for scan response
Prerepa Viswanadham [Fri, 16 Jan 2015 18:40:11 +0000 (10:40 -0800)]
Don't compute flags length for scan response
Bug
19041626
Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
Benjamin Franz [Fri, 23 Jan 2015 15:32:30 +0000 (15:32 +0000)]
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
Christoph Studer [Fri, 23 Jan 2015 17:00:00 +0000 (17:00 +0000)]
am
73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev
automerge:
9e9885e
* commit '
9e9885e1c0b34a6284235e61b023013c1ded6468':
SysUI: Don't drop HUN notification when clicked
Christoph Studer [Fri, 23 Jan 2015 16:55:31 +0000 (16:55 +0000)]
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
Christoph Studer [Fri, 23 Jan 2015 16:51:45 +0000 (16:51 +0000)]
Merge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev
Benjamin Franz [Fri, 23 Jan 2015 14:42:38 +0000 (14:42 +0000)]
am
bfca5f40: am
266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
* commit '
bfca5f40eb9e5d888218c615fa744e5d8ea2d207':
Avoid SecurityException when calling getUserData
Benjamin Franz [Fri, 23 Jan 2015 14:37:42 +0000 (14:37 +0000)]
am
266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
* commit '
266303fdb02ca1cf6df348e1af6830675476fd78':
Avoid SecurityException when calling getUserData
Benjamin Franz [Fri, 23 Jan 2015 14:33:04 +0000 (14:33 +0000)]
Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
Zoltan Szatmary-Ban [Fri, 16 Jan 2015 12:36:29 +0000 (12:36 +0000)]
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
Lorenzo Colitti [Fri, 23 Jan 2015 13:01:42 +0000 (13:01 +0000)]
am
50f9d93a: am
ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
* commit '
50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
Support connecting to networks with misconfigured subnet masks.
Lorenzo Colitti [Fri, 23 Jan 2015 12:56:58 +0000 (12:56 +0000)]
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.
Lorenzo Colitti [Fri, 23 Jan 2015 12:50:31 +0000 (12:50 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
Lorenzo Colitti [Tue, 20 Jan 2015 06:53:02 +0000 (15:53 +0900)]
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
Narayan Kamath [Fri, 23 Jan 2015 10:54:44 +0000 (10:54 +0000)]
Merge "Remove superfluous OpenSSL include paths." automerge:
fe24754
automerge:
d555cd5
* commit '
d555cd550d634192e96e3b834f91aa9559a259db':
Remove superfluous OpenSSL include paths.
Narayan Kamath [Fri, 23 Jan 2015 10:50:41 +0000 (10:50 +0000)]
Merge "Remove superfluous OpenSSL include paths."
automerge:
fe24754
* commit '
fe24754fd69e75829c748b56e5806f1603835db9':
Remove superfluous OpenSSL include paths.
Narayan Kamath [Fri, 23 Jan 2015 10:47:34 +0000 (10:47 +0000)]
Merge "Remove superfluous OpenSSL include paths."
Jinsuk Kim [Fri, 23 Jan 2015 06:39:00 +0000 (15:39 +0900)]
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
Jinsuk Kim [Fri, 23 Jan 2015 08:23:27 +0000 (08:23 +0000)]
am
3379c1cb: Fix broken build
automerge:
2652c57
* commit '
2652c57257416f088de3e5b359f36a63e3cbe91d':
Fix broken build
Jinsuk Kim [Fri, 23 Jan 2015 08:19:56 +0000 (08:19 +0000)]
am
3379c1cb: Fix broken build
* commit '
3379c1cb62488393c2c49b5f38483656c7175fa1':
Fix broken build
Jinsuk Kim [Fri, 23 Jan 2015 08:13:28 +0000 (17:13 +0900)]
Fix broken build
Updated system-current.txt
Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
Jinsuk Kim [Fri, 23 Jan 2015 07:00:40 +0000 (07:00 +0000)]
am
76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
automerge:
9ae7d49
* commit '
9ae7d4975ce471a7b295282ca999cb20a6cbb273':
CEC: Add logic to return to internal source
Jinsuk Kim [Fri, 23 Jan 2015 06:56:24 +0000 (06:56 +0000)]
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