OSDN Git Service
John Reck [Wed, 22 Oct 2014 16:25:49 +0000 (16:25 +0000)]
Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 15:53:01 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 15:46:41 +0000 (08:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I478370f6105138f39c9dad5079b7c434fa8078b3
Auto-generated-cl: translation import
John Reck [Tue, 21 Oct 2014 17:09:36 +0000 (10:09 -0700)]
Surface:lockHardwareCanvas DO NOT MERGE
Bug:
17440886
Cherry pick of
bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2
Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
Geoff Mendal [Wed, 22 Oct 2014 13:37:04 +0000 (06:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifca413c79959bf4b6585f0fb9b7a5ed1acf1ec9f
Auto-generated-cl: translation import
Deepanshu Gupta [Wed, 22 Oct 2014 01:17:32 +0000 (01:17 +0000)]
Merge "Check Bridge init before disposing." into lmp-dev
automerge:
568f16c
* commit '
568f16ccfbe95d5a68e3e3a732565a1063d5160e':
Check Bridge init before disposing.
Jinsuk Kim [Wed, 22 Oct 2014 01:16:26 +0000 (01:16 +0000)]
Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev
automerge:
0c74939 -s ours
* commit '
0c74939024cb2aec9e8348808366170d77d6e8e7':
CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
Deepanshu Gupta [Wed, 22 Oct 2014 00:57:30 +0000 (00:57 +0000)]
Merge "Check Bridge init before disposing." into lmp-dev
Santos Cordon [Tue, 21 Oct 2014 23:29:41 +0000 (23:29 +0000)]
am
028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev
* commit '
028217eb6789e82c96ef5ff5fe0a5a9e0c740d97':
Add hidden method to access a connection's service.
Jinsuk Kim [Tue, 21 Oct 2014 23:25:57 +0000 (23:25 +0000)]
Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev
Santos Cordon [Tue, 21 Oct 2014 23:22:00 +0000 (23:22 +0000)]
Merge "Add hidden method to access a connection's service." into lmp-dev
Filip Gruszczynski [Tue, 21 Oct 2014 22:14:39 +0000 (22:14 +0000)]
Merge "Disable activity's translucency until it starts being swiped away." into lmp-sprout-dev
Guang Zhu [Tue, 21 Oct 2014 22:12:38 +0000 (22:12 +0000)]
am
ccbeb61a: Block monkey from creating user profiles
* commit '
ccbeb61ac21527839deb115199cbe98fa2b73c05':
Block monkey from creating user profiles
Filip Gruszczynski [Tue, 21 Oct 2014 17:11:27 +0000 (10:11 -0700)]
Disable activity's translucency until it starts being swiped away.
Change-Id: Ia5dceac7bd9ff57920a43736f9db6a33175e01ac
Jinsuk Kim [Mon, 20 Oct 2014 22:14:46 +0000 (07:14 +0900)]
CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.
Bug:
17408780
Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
(cherry picked from commit
b22d9ee0a364b10d488dd6a2e8ba69d5ca7f6258)
Adrian Roos [Tue, 21 Oct 2014 21:43:05 +0000 (21:43 +0000)]
am
7b4a38b1: Delay discovery of system trust agents
* commit '
7b4a38b197ce43cb286d80fc6c4e9713b2807f13':
Delay discovery of system trust agents
Guang Zhu [Tue, 21 Oct 2014 21:33:50 +0000 (14:33 -0700)]
Block monkey from creating user profiles
Bug:
17721767
Change-Id: Ibf686d6aa5da29411ee23f8ce6826ed93c1fa970
Adrian Roos [Tue, 21 Oct 2014 15:07:39 +0000 (17:07 +0200)]
Delay discovery of system trust agents
Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.
Bug:
18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
Leon Scroggins III [Tue, 21 Oct 2014 13:56:42 +0000 (13:56 +0000)]
am
3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
* commit '
3c8bde5534d81518f5baf3795989f367373f7dfd':
Report that a JavaInputStreamAdaptor is at end.
Leon Scroggins III [Tue, 21 Oct 2014 13:52:29 +0000 (13:52 +0000)]
Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
Robin Lee [Tue, 21 Oct 2014 11:58:38 +0000 (11:58 +0000)]
am
e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit '
e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
DevicePolicy: Restore CA warning to K behaviour
Robin Lee [Tue, 21 Oct 2014 11:54:50 +0000 (11:54 +0000)]
Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 23:39:57 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 23:21:14 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
Leon Scroggins III [Thu, 16 Oct 2014 20:50:41 +0000 (16:50 -0400)]
Report that a JavaInputStreamAdaptor is at end.
This prevents a naive caller from continuing to attempt to read.
BUG:
17419670
BUG:
17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
RoboErik [Mon, 20 Oct 2014 22:14:10 +0000 (22:14 +0000)]
am
2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
* commit '
2fa604fc59ded63a416066a0bc66f63069cae7f3':
Add missing break to switch statement
RoboErik [Mon, 20 Oct 2014 22:08:06 +0000 (22:08 +0000)]
Merge "Add missing break to switch statement" into lmp-dev
RoboErik [Mon, 20 Oct 2014 21:56:32 +0000 (14:56 -0700)]
Add missing break to switch statement
the skip to queue item case was falling through when it shouldn't.
bug:
18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
Griff Hazen [Mon, 20 Oct 2014 21:43:15 +0000 (21:43 +0000)]
Merge "Disable zen log printouts by default" into lmp-sprout-dev
Wei Wang [Mon, 20 Oct 2014 21:41:28 +0000 (21:41 +0000)]
Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
smain@google.com [Mon, 20 Oct 2014 21:40:11 +0000 (21:40 +0000)]
am
21de5f3f: Doc change: misc changes to highlights.
* commit '
21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
Doc change: misc changes to highlights.
smain@google.com [Mon, 20 Oct 2014 21:33:00 +0000 (14:33 -0700)]
Doc change: misc changes to highlights.
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
Wink Saville [Mon, 20 Oct 2014 21:17:28 +0000 (21:17 +0000)]
Merge "Radio Capability Support." into lmp-sprout-dev
Griff Hazen [Mon, 20 Oct 2014 21:02:59 +0000 (14:02 -0700)]
Disable zen log printouts by default
Bug:
18056528
Change-Id: I77359476ff2f67027383fcdb91d2843d040533c7
Adam Lesinski [Mon, 20 Oct 2014 21:00:23 +0000 (21:00 +0000)]
am
3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
* commit '
3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
AAPT: Fix path for final generated resources on Windows
Adam Lesinski [Mon, 20 Oct 2014 20:55:48 +0000 (20:55 +0000)]
Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
Robin Lee [Mon, 20 Oct 2014 20:46:53 +0000 (21:46 +0100)]
DevicePolicy: Restore CA warning to K behaviour
Some tests rely on this being dismissible. Additionally it turns out
some users don't like having a hulking great notification follow them
around everywhere.
Bug:
17985258
Change-Id: If05a07b9eaa402a48f9a14647effc1df32c796e1
ztenghui [Mon, 20 Oct 2014 20:35:58 +0000 (20:35 +0000)]
am
877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev
* commit '
877ce2c42b5d423719246f5458cd66fa9fddb317':
Make sure the bitmap from VD's cache is drawn using bi-linear filter.
ztenghui [Mon, 20 Oct 2014 20:29:15 +0000 (20:29 +0000)]
Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev
Adam Lesinski [Mon, 20 Oct 2014 19:15:25 +0000 (12:15 -0700)]
AAPT: Fix path for final generated resources on Windows
Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
RoboErik [Mon, 20 Oct 2014 19:13:20 +0000 (19:13 +0000)]
am
578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
* commit '
578fbe898f1652b3166bd4e20647572dec9dfb14':
Set the metadata rating correctly in RCC
RoboErik [Mon, 20 Oct 2014 19:07:51 +0000 (19:07 +0000)]
Merge "Set the metadata rating correctly in RCC" into lmp-dev
Santos Cordon [Fri, 17 Oct 2014 02:23:54 +0000 (19:23 -0700)]
Add hidden method to access a connection's service.
This change exposes a method that is used by the actual
fix here: I4e4789c044d9e3614f42143cfa6053881a6d109b
Bug:
17962996
Change-Id: Iec3795ea372634120c71b0a80ee046e372569ecf
Deepanshu Gupta [Mon, 20 Oct 2014 18:07:38 +0000 (11:07 -0700)]
Check Bridge init before disposing.
In some cases ADT may dispose the Bridge even before init is called on
it. This caused an NPE. Fixed this by checking for the initialization
before disposing resources.
Bug: http://b.android.com/77726
Change-Id: I741d6ea3595a3b7cb816abd0417f23aecca6370e
Wink Saville [Fri, 17 Oct 2014 22:03:58 +0000 (15:03 -0700)]
Radio Capability Support.
New design of capability switch for L.
Add new RIL requests:
RIL_REQUEST_GET_RADIO_CAPABILITY
RIL_REQUEST_SET_RADIO_CAPABILITY
RIL_UNSOL_RADIO_CAPABILITY
These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.
It can support 2/3/4G switch and has flexible architecture to support
future technology.
Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1
Geoff Mendal [Mon, 20 Oct 2014 17:02:53 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 17:02:10 +0000 (17:02 +0000)]
am
00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
00831836cdeeb4a61ba10c724c3ca33280937b62':
Import translations. DO NOT MERGE
smain@google.com [Mon, 20 Oct 2014 16:57:22 +0000 (16:57 +0000)]
am
065b94c6: update workplace description in lollipop highlights bug:
18038081
* commit '
065b94c6a634e7a765f2674cff696a75e76f6425':
update workplace description in lollipop highlights bug:
18038081
Geoff Mendal [Mon, 20 Oct 2014 16:56:45 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
smain@google.com [Mon, 20 Oct 2014 16:41:08 +0000 (09:41 -0700)]
update workplace description in lollipop highlights
bug:
18038081
Change-Id: I612fc52392bc0fb71cc2e7b4c0da1fcaae6ac6fe
RoboErik [Mon, 20 Oct 2014 16:48:13 +0000 (09:48 -0700)]
Set the metadata rating correctly in RCC
We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.
bug:
18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
Geoff Mendal [Mon, 20 Oct 2014 16:44:01 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id9f97226c8140113ba6f35b67b9a7855d591ff5e
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 16:34:39 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3dd702947875349b8ca04edb813687588e4db689
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 14:13:08 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 14:10:05 +0000 (14:10 +0000)]
am
bae5d85a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
bae5d85a773af7c40578160ca4ba4261de0c68c5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 14:09:28 +0000 (07:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I475289e0e1a2e21a9e7be5bc08dce515e3386812
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 13:41:24 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 13:35:29 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d2178c81e9acc3ce353f317787cb12f6e158666
Auto-generated-cl: translation import
Adrian Roos [Mon, 20 Oct 2014 13:04:00 +0000 (13:04 +0000)]
am
9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev
* commit '
9c5896b808f77295aa5cd09cb37ad01bccd7994c':
Always execute resumeAppSwitches when launching something
Adrian Roos [Mon, 20 Oct 2014 12:58:58 +0000 (12:58 +0000)]
Merge "Always execute resumeAppSwitches when launching something" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 22:17:13 +0000 (22:17 +0000)]
am
67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
67b404d688e8da44d104d54c78a8e37f88a4529b':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:17:10 +0000 (22:17 +0000)]
am
a4cbfb82: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a4cbfb822ea1afc110dc974f22e22906741f5c2e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:11:41 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 22:11:32 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 20:18:18 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import
Baligh Uddin [Sun, 19 Oct 2014 19:57:36 +0000 (19:57 +0000)]
am
4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4199680a9da3fa01be65606e735deab3be089b23':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:57:33 +0000 (19:57 +0000)]
am
7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:57:29 +0000 (19:57 +0000)]
am
cfccba99: (-s ours) Import translations. DO NOT MERGE
* commit '
cfccba99a234a5883300a7542ec12ddfec012ff3':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:55:23 +0000 (12:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I382cff15f6fd4e02e2781bbb2b51e7eb3897b6fc
Auto-generated-cl: translation import
Baligh Uddin [Sun, 19 Oct 2014 19:46:08 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 19:46:06 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 17:56:51 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import
Baligh Uddin [Sun, 19 Oct 2014 17:52:12 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia00d92d408a620fb80268de3413c2299c9f9ed18
Auto-generated-cl: translation import
Baligh Uddin [Sun, 19 Oct 2014 17:50:27 +0000 (10:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ab5446cb270035eae9fce5bad1652ca57c9c5d8
Auto-generated-cl: translation import
smain@google.com [Sun, 19 Oct 2014 02:42:00 +0000 (02:42 +0000)]
am
a2f07a88: add info about device owner app to the workplace highlights
* commit '
a2f07a88aa92d60b28295e84f440dbb4025d3eeb':
add info about device owner app to the workplace highlights
smain@google.com [Sun, 19 Oct 2014 01:18:49 +0000 (18:18 -0700)]
add info about device owner app to the workplace highlights
Change-Id: Ib1c5809e0d9e923fd71f4b33b1ef44091f1f3df4
smain@google.com [Sun, 19 Oct 2014 00:08:50 +0000 (00:08 +0000)]
am
f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev
* commit '
f3e585ab20be006c8d5f3a033f9ade8a9dc6b55f':
add glare effect to screenshot and add 1x version with srcset
smain@google.com [Sun, 19 Oct 2014 00:04:52 +0000 (00:04 +0000)]
Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev
smain@google.com [Sat, 18 Oct 2014 23:44:06 +0000 (16:44 -0700)]
add glare effect to screenshot and add 1x version with srcset
Change-Id: I28ccd7bf509a65859b81e4fed8c63fbe62dad0b4
smain@google.com [Sat, 18 Oct 2014 23:19:40 +0000 (23:19 +0000)]
am
9e9d5a36: add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
* commit '
9e9d5a369fb00730d58220eaa79082e351cf8bcd':
add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
smain@google.com [Sat, 18 Oct 2014 22:16:53 +0000 (15:16 -0700)]
add info about workspaces to the lollipop highlights
also move the workplace launcher image from the API Overview to
the highlights... and also just remove all images from the Overview
for simplicity there.
Change-Id: I36cc6d58efa6c5c912971b8636fde064b0f26797
Prem Kumar [Sat, 18 Oct 2014 19:56:03 +0000 (19:56 +0000)]
am
7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev
* commit '
7666c912b820e61c58b57ad691b4b3babca9fbf9':
set autojoin associated scan frequency to 20 seconds
Prem Kumar [Sat, 18 Oct 2014 19:51:50 +0000 (19:51 +0000)]
Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev
Wei Wang [Fri, 17 Oct 2014 02:39:52 +0000 (19:39 -0700)]
Remove spammy log information for BLE scan.
Bug:
17574681
Change-Id: Ic5761ad7262200f38f2b67659c37f8a3f01d80d5
Alan Viverette [Sat, 18 Oct 2014 00:26:21 +0000 (00:26 +0000)]
am
15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
* commit '
15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
Translate compound button drawable by scroll position
Alan Viverette [Sat, 18 Oct 2014 00:20:26 +0000 (00:20 +0000)]
Merge "Translate compound button drawable by scroll position" into lmp-dev
Alan Viverette [Sat, 18 Oct 2014 00:19:12 +0000 (17:19 -0700)]
Translate compound button drawable by scroll position
BUG:
18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
Kristian Monsen [Fri, 17 Oct 2014 23:57:18 +0000 (23:57 +0000)]
am
5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev
* commit '
5d6041813283086c5a290ad6ca07e05b1a6ffc14':
Let TYPE_ANNOUNCEMENT be sent from any window
Kristian Monsen [Fri, 17 Oct 2014 23:54:00 +0000 (23:54 +0000)]
Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev
Jim Miller [Fri, 17 Oct 2014 23:52:41 +0000 (23:52 +0000)]
am
c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
* commit '
c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
Add utility methods to LockPatternUtils for encryption
Jim Miller [Fri, 17 Oct 2014 23:48:20 +0000 (23:48 +0000)]
Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
Yorke Lee [Fri, 17 Oct 2014 23:19:31 +0000 (23:19 +0000)]
am
e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
* commit '
e4e3fcec415cdc9739f32ce1eaaec67666e5454d':
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
Yorke Lee [Fri, 17 Oct 2014 23:16:33 +0000 (23:16 +0000)]
Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
Jim Miller [Fri, 17 Oct 2014 02:50:18 +0000 (19:50 -0700)]
Add utility methods to LockPatternUtils for encryption
This enables a change in Settings that allows device
encryption to be disabled by the user.
Fixes bug
17881324
Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
Svetoslav [Fri, 17 Oct 2014 23:04:12 +0000 (23:04 +0000)]
am
cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
* commit '
cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
Accessibility no longer overrides strong encryption.
Svetoslav [Fri, 17 Oct 2014 22:59:20 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption." into lmp-dev
Adam Lesinski [Fri, 17 Oct 2014 22:56:10 +0000 (22:56 +0000)]
am
3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
* commit '
3cd840f4b5a2988700a6b366fa32f4565c319900':
AAPT: Fix an issue where a resource name was incorrectly derived on Windows
Adam Lesinski [Fri, 17 Oct 2014 22:50:48 +0000 (22:50 +0000)]
Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
William Bourke [Fri, 17 Oct 2014 22:03:50 +0000 (22:03 +0000)]
am
84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
* commit '
84b4791aaf0384a334068a97c70fcda162cfadab':
Modified lollipop Easter egg for TV compatibility
Joe Fernandez [Fri, 17 Oct 2014 22:03:47 +0000 (22:03 +0000)]
am
6dc5d683: docs: Android L release fixes
* commit '
6dc5d68399377eb8d6a3132c2af475d92ed8aca5':
docs: Android L release fixes
OSDN Git Service
