OSDN Git Service
TreeHugger Robot [Fri, 25 Aug 2017 21:25:02 +0000 (21:25 +0000)]
Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev
Felipe Leme [Fri, 25 Aug 2017 19:36:56 +0000 (19:36 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev
am:
560221752e
Change-Id: Ib2924dae99bfe132a56a1583ecf4a88f833d3937
TreeHugger Robot [Fri, 25 Aug 2017 19:12:22 +0000 (19:12 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev
TreeHugger Robot [Thu, 24 Aug 2017 16:01:06 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 24 Aug 2017 11:18:53 +0000 (04:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ied6de9cbe69d8c72f9ba8c0095451a175f02d4dd
Bill Yi [Thu, 24 Aug 2017 03:13:10 +0000 (20:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ifc65484d51405de737a5b269fe6b6036638d0df1
Tim Murray [Wed, 23 Aug 2017 19:48:14 +0000 (19:48 +0000)]
Merge "power: throttle interaction hints" into oc-dev
am:
78701217fd -s ours
Change-Id: I5135ddb75679ff6e4ffe5bb8daff97daf05deb34
TreeHugger Robot [Wed, 23 Aug 2017 19:25:47 +0000 (19:25 +0000)]
Merge "power: throttle interaction hints" into oc-dev
Adrian Roos [Mon, 21 Aug 2017 15:17:20 +0000 (17:17 +0200)]
AOD: Only play wakeup animation when actually waking up
Fixes an issue where the wake up animation could play when going to sleep,
if the screen turning on for AOD happened after the finishing going to sleep.
Change-Id: I6b00aaefb672a630f43ca229d6cc66d12bc4205c
Fixes:
64814671
Test: Pull up app launcher, turn off screen, verify AOD does not blink.
(cherry picked from commit
b9afae2e50c0240ee103ab44fad13b75aef985b6)
Baligh Uddin [Mon, 21 Aug 2017 21:40:53 +0000 (21:40 +0000)]
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
am:
230c78cec5 -s ours
Change-Id: Ida80fe80780bf4f811aa54e0163f5c936f4d16a6
The Android Automerger [Mon, 21 Aug 2017 21:28:42 +0000 (21:28 +0000)]
DO NOT MERGE ANYWHERE Manually merge commit '
fd35d7c0a284' into oc-dr1-dev
BUG:
64864568
Baligh Uddin [Sat, 19 Aug 2017 22:31:46 +0000 (15:31 -0700)]
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
Bug:
64864568
This reverts commit
fd35d7c0a284e31231e2f424cade864be695965b, reversing
changes made to
07a21754f45672b27e765d8c7677c9663c6dce91.
Tyler Freeman [Sat, 19 Aug 2017 00:11:01 +0000 (00:11 +0000)]
Merge "Remove gender-specific pronouns from documentation" into oc-dev
Tyler Freeman [Wed, 9 Aug 2017 20:55:44 +0000 (13:55 -0700)]
Remove gender-specific pronouns from documentation
Bug:
64847340
Change-Id: Ifc48cebbab8ad1d7223d75637eb63049bc28ae7c
Seigo Nonaka [Fri, 18 Aug 2017 00:49:08 +0000 (00:49 +0000)]
Merge "Fix race condition of removing surface." into oc-dev
am:
07a21754f4 -s ours
Change-Id: Ic850275cc7f81629adcc5081ec9f137e531b9495
TreeHugger Robot [Fri, 18 Aug 2017 00:40:55 +0000 (00:40 +0000)]
Merge "Fix race condition of removing surface." into oc-dev
TreeHugger Robot [Thu, 17 Aug 2017 23:03:35 +0000 (23:03 +0000)]
Merge "Let the foreground service channel be blocked" into oc-dr1-dev
Tony Mak [Thu, 17 Aug 2017 22:23:15 +0000 (22:23 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am:
0c2b2d1f87 -s ours
am:
c9a9fcdcd3 -s ours
Change-Id: I453d676952f885b1fc4afc21c0c11a17ae0bb90c
Tony Mak [Thu, 17 Aug 2017 22:07:36 +0000 (22:07 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev
am:
0c2b2d1f87 -s ours
Change-Id: Id0fe09b6f6ba687b6597ce2f97b6b8d83fbc4915
TreeHugger Robot [Thu, 17 Aug 2017 21:56:52 +0000 (21:56 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev
Julia Reynolds [Thu, 17 Aug 2017 17:34:27 +0000 (13:34 -0400)]
Let the foreground service channel be blocked
And update the channel name
Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1
Fixes:
36891897
Test: manual
Felipe Leme [Wed, 16 Aug 2017 16:21:46 +0000 (09:21 -0700)]
Minor Autofill javadoc fixes.
Bug:
64125551
Test: no, thanks
Change-Id: Idea93d3a55705fbed6ede7eac0c0791300ff1c90
Dianne Hackborn [Mon, 31 Jul 2017 20:56:02 +0000 (13:56 -0700)]
Maps crashed entering PIP right after...
...beginning navigation
Bug:
64140901
Test: booted and ran and posted notifications.
Merged-In:I8c9173dab2716b901cc6dd66f0b0d18cae33f298
Change-Id: I8c9173dab2716b901cc6dd66f0b0d18cae33f298
(cherry picked from commit
52195a66311d79a2f57e8112db86d48ed15bf915)
Vineeta Srivastava [Thu, 17 Aug 2017 03:07:47 +0000 (03:07 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev
Svetoslav Ganov [Thu, 17 Aug 2017 02:34:36 +0000 (02:34 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
am:
357f42bf69
Change-Id: I42b5eabd1e21aa5b7c5ab71b34d5eadada0023aa
TreeHugger Robot [Thu, 17 Aug 2017 02:29:21 +0000 (02:29 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
Svetoslav Ganov [Wed, 16 Aug 2017 21:50:00 +0000 (14:50 -0700)]
Properly compute default and system set flag on an upgrade
We added the notions of a default value and whether this default is set
by the system for a setting which is needed for experiments since in
case a bad value is pushed we should be able to incrementally rollback
to a stable state. If a system component sets a setting value this
automatically becomes the default. System components are the platform
package, the special UIDs (telephony, etc), apps singed with the
platform cert, system installed persistent apps, and SUW.
In N we did not have the notion of a default and during an upgrade need
to adjust the default and whether this default is set by the system.
This migration runs as the system UID and was incorrectly computing that
the package that changed the settings last was a part of the system and
setting the current value as its default set by the system. This
resulted in taking more storage space as we also count the default which
led the package which changed the setting to go over the quota and that
throws. If the first caller into the settings provider is the system
main
thread (almost certain) we end up throwing an exception on the system
main thread - crashing the system server.
Test: flash N, install an app abusing sys settings, update to O
Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e
bug:
64718888
Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
Michael Wright [Wed, 16 Aug 2017 19:38:21 +0000 (20:38 +0100)]
Add new "fast" filter for ambient light.
The slow filter wasn't converging fast enough when we shortened the
debounce timings but we still want it to ensure there's a long term
change happening, so add a new filter that converges much faster. This
new fast filter is just a weighted sliding window just like the slow
filter, but it has a significantly smaller horizon.
Bug:
64514692
Test: manual
Change-Id: I1e990ac1e6a56268fa42a85399a2d41cc8dd2104
TreeHugger Robot [Thu, 17 Aug 2017 01:10:16 +0000 (01:10 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 00:31:42 +0000 (00:31 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev
Siarhei Vishniakou [Thu, 17 Aug 2017 00:14:48 +0000 (00:14 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours
am:
3455f8f527
Change-Id: Id27376f6e99bb52527e6f02af9a2a654bdc1f5b0
Siarhei Vishniakou [Wed, 16 Aug 2017 23:47:50 +0000 (23:47 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee
am:
1ca8da1969 -s ours
Change-Id: I7db93785a58b059d17725188d42adfd4c7b7780a
Siarhei Vishniakou [Wed, 16 Aug 2017 23:30:28 +0000 (23:30 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8
am:
a5ba83e2ee
Change-Id: I442dc3021f89fe808159ce8787e4d2950a4d0806
Siarhei Vishniakou [Wed, 16 Aug 2017 23:09:40 +0000 (23:09 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2
am:
3674e3d9d8
Change-Id: I9bc6659634cd92ceadc9b0560f2802b90b24d573
Siarhei Vishniakou [Wed, 16 Aug 2017 22:55:31 +0000 (22:55 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99
am:
a5e996c2e2
Change-Id: Idfdd87bbf432a23d73a544810bbda29126f15c6d
Justin Klaassen [Wed, 16 Aug 2017 22:37:08 +0000 (15:37 -0700)]
DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings
There is an issue in the translation pipeline so these strings have
been updated manually to match the English version.
Fixes:
63899732
Test: Verified strings in non-English locales.
Change-Id: I9db3417fc58370990566053976b0995b00127e56
Siarhei Vishniakou [Wed, 16 Aug 2017 22:39:46 +0000 (22:39 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours
am:
712baa6c99
Change-Id: Ic2c5a354d8ee69609a6152d75ccdbe66fb8e3daa
Siarhei Vishniakou [Wed, 16 Aug 2017 22:19:11 +0000 (22:19 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9
am:
b007784ed1 -s ours
Change-Id: I152a8ebaf97c37be52de29c0639fa221a28b5fce
Siarhei Vishniakou [Wed, 16 Aug 2017 21:56:58 +0000 (21:56 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02
am:
a23674b4f9
Change-Id: I1071a79ff62a800027c5da1ffad9401e83f541b1
Siarhei Vishniakou [Wed, 16 Aug 2017 21:39:41 +0000 (21:39 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7
am:
e8b48abb02
Change-Id: I171e3e1d9575f4e9b61ee46cfc08ac4331d6d245
Siarhei Vishniakou [Wed, 16 Aug 2017 21:26:49 +0000 (21:26 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours
am:
6a7c6a24a7
Change-Id: I72398c99878637d26dbb976bab05aca315368729
Siarhei Vishniakou [Wed, 16 Aug 2017 21:15:05 +0000 (21:15 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553
am:
3d1931d4e3 -s ours
Change-Id: Ieb19904cf060072d2525836ebba9f310da515b4b
Julia Reynolds [Tue, 15 Aug 2017 18:43:00 +0000 (14:43 -0400)]
Optionally append managed service approvals
If the backup comes from a pre O device, don't wipe
preexisting managed service grants (which were introduced in O).
Merged-In: I142df7acb11309bc4f5f185e45a1f91f86d0334a
Merged-In: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987
Test: manual, restore from N to O DR
Bug:
64232609
Change-Id: Ieec2c821d9a088c69a5bc143acf8537ba300202d
Siarhei Vishniakou [Wed, 16 Aug 2017 20:50:20 +0000 (20:50 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours
am:
b737365553
Change-Id: I375324a937478c584e95cb6550d98293162656fc
Bill Yi [Wed, 16 Aug 2017 20:39:30 +0000 (20:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev
Bill Yi [Wed, 16 Aug 2017 20:37:47 +0000 (20:37 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
0a2337f7473cbaca630d48b19d923516fd3c131d.
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
63899732
Change-Id: Ib5c23d395c3681d8d679f02758bbc6337f681ce8
Siarhei Vishniakou [Wed, 16 Aug 2017 20:35:40 +0000 (20:35 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours
am:
3280efe50e -s ours
Change-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd
Android Build Merger (Role) [Wed, 16 Aug 2017 20:33:32 +0000 (20:33 +0000)]
Merge "Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680 am:
35c3b58d46 am:
c29ad5c94c" into oc-dr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Charles He [Wed, 16 Aug 2017 20:29:58 +0000 (20:29 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680 am:
35c3b58d46
am:
c29ad5c94c
Change-Id: Ie4453acd727f8f581c1224ee0f288e3150b97446
Siarhei Vishniakou [Wed, 16 Aug 2017 20:19:29 +0000 (20:19 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6
am:
9d99b0001e -s ours
Change-Id: Ib0fb40f990138b3729b66bdb6d6a095bd3ad231d
Charles He [Wed, 16 Aug 2017 20:15:23 +0000 (20:15 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680
am:
35c3b58d46
Change-Id: I9ce7456fec5af181ec5e42bfc5f139a1b00137cf
Siarhei Vishniakou [Wed, 16 Aug 2017 20:03:29 +0000 (20:03 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff
am:
96fe6421f6
Change-Id: Ia2ce3f8b95b578253c5336407ae85880d3d317f4
Charles He [Wed, 16 Aug 2017 20:03:15 +0000 (20:03 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d
am:
69ae08b680
Change-Id: Ida122a46fece975924a002e6a5a0f6521ed8756f
Charles He [Wed, 16 Aug 2017 19:51:43 +0000 (19:51 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662
am:
510f02244d
Change-Id: I3bfe22ab41813abbeebee58d7cc8789e95a1a2fa
Siarhei Vishniakou [Wed, 16 Aug 2017 19:48:22 +0000 (19:48 +0000)]
DO NOT MERGE Remove window obscurement information.
am:
c3c2ed94ff
Change-Id: Ib9552165e9b1c2dfcd235d1f7930d85c258b2ece
TreeHugger Robot [Wed, 16 Aug 2017 19:41:53 +0000 (19:41 +0000)]
Merge "Fix sync back-off" into oc-dr1-dev
Charles He [Wed, 16 Aug 2017 19:39:50 +0000 (19:39 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c
am:
a175bae662
Change-Id: Id250bcbcf92bdb95813dc4fcdd772aeef7f29c0a
Charles He [Wed, 16 Aug 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1
am:
6adae5108c
Change-Id: I104eea9bf02f89b6c2bde0daeff81aaa781e323d
Charles He [Wed, 16 Aug 2017 19:13:17 +0000 (19:13 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70
am:
733c7607d1
Change-Id: Id1c4c4de5d6e4da05188326287ae86e74bf89623
Kevin Hufnagle [Wed, 16 Aug 2017 19:01:36 +0000 (19:01 +0000)]
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
am:
80376a98a5
Change-Id: Iae8814e722f7861ecd96980d16c06a676c6ad1dc
Charles He [Wed, 16 Aug 2017 18:58:11 +0000 (18:58 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92
am:
5d34739d70
Change-Id: I51f9bbaa35a853ec3442267cbb9327a2a64ff1d1
Tim Murray [Fri, 14 Jul 2017 20:54:37 +0000 (13:54 -0700)]
power: throttle interaction hints
Don't send power HAL interaction hints more than every 100ms. Also can send userActivity
calls every 100ms too (down from 500ms).
Test: power HAL doesn't run every 8ms
Bug:
63632697
Change-Id: Ic986f6fc51e58f8060f7bf2d2ac61a9906be5c1f
Charles He [Wed, 16 Aug 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours
am:
5048fc8e92
Change-Id: Ib55158e1608d7eeba7d41854377ed1e93e283a75
Kevin Hufnagle [Wed, 16 Aug 2017 18:44:34 +0000 (18:44 +0000)]
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
Charles He [Wed, 16 Aug 2017 18:37:17 +0000 (18:37 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
am:
039b357a46 -s ours
Change-Id: Ia916a0c1a5ec5d63e4e76ed9da9d563fd39d3823
Bill Yi [Wed, 16 Aug 2017 17:31:37 +0000 (10:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
63899732
Change-Id: I23b308a57669e20e44b8bb503dca33b905a31f4c
Cindy Kuang [Wed, 16 Aug 2017 17:12:08 +0000 (17:12 +0000)]
Merge "docs: corrected code example mistakes" into oc-dev
am:
5714da6e93
Change-Id: I75b35bd6ff92b345c3fd9d27fdf03e5db2927be9
Cindy Kuang [Wed, 16 Aug 2017 16:59:31 +0000 (16:59 +0000)]
Merge "docs: corrected code example mistakes" into oc-dev
Andrii Kulian [Wed, 16 Aug 2017 06:20:59 +0000 (06:20 +0000)]
Merge "Limit black background to only base and starting windows" into oc-dr1-dev
Andrii Kulian [Wed, 16 Aug 2017 00:49:24 +0000 (17:49 -0700)]
Limit black background to only base and starting windows
Show black background behind nav bar only behind windows
with type TYPE_APPLICATION_STARTING or TYPE_BASE_APPLICATION,
which corresponds to main window of an activity.
Bug:
64711770
Test: Go to Wallpapers app, select a static one, click "set" and check the background of the dialog.
Test: Open letterboxed app, go to/from Recents.
Change-Id: I42357a5df70b5dd58b422f31704c71d36074a50c
Jean-Michel Trivi [Wed, 16 Aug 2017 00:52:22 +0000 (17:52 -0700)]
AudioService: device connection intent: never send null action
Change
145c95342c9c removed a test on the type of device for which
a ACTION_HEADSET_PLUG intent is broadcast. As a result, for some
devices (e.g. DEVICE_OUT_USB_DEVICE), there is a code path in
AudioService.sendDeviceConnectionIntent() where the intent's
action is not set, causing a WTF exception to be thrown for
the broadcast.
The fix consists in always checking that the intent will be sent
with a non-null action.
Test: connect a USB device recognized as DEVICE_OUT_USB_DEVICE
Bug:
64724117
Change-Id: Ib2a486d1fabbde58d6a8f8370d5803c694977ee1
Makoto Onuki [Tue, 15 Aug 2017 21:56:47 +0000 (14:56 -0700)]
Fix sync back-off
CL Ifb2fc5207 affected multiple different scenario:
a) When a sync finished successfully
b) When a sync finished with a failure
c) When a sync is canceled by the sync manager
Among those, c) was the actual fix for b/
63773598, and the change was supposed
to not change the actual behavior of a) and b).
However it turned out it was breaking b) by interfering back-off scheduling.
This change will revert Ifb2fc5207 for a) and b) to restore the original
behavior with keeping the fix fo C.
Bug:
63773598
Bug:
64597061
Test: Manual test with test app.
Change-Id: I34e5945a7a67d55cd6138f758e97d724d4b9d4b5
Felipe Leme [Tue, 15 Aug 2017 21:33:01 +0000 (21:33 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
am:
36cbdef880
Change-Id: Ie198dbbdc7ab4ea1089c7363f1b1d2df333c1d8f
Charles He [Tue, 15 Aug 2017 21:16:36 +0000 (21:16 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
am:
0fa9328b80
Change-Id: I4fc74296d3da5fef830e9ffe0eedc74bb4fb047b
TreeHugger Robot [Tue, 15 Aug 2017 21:12:32 +0000 (21:12 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
Tony Mak [Tue, 15 Aug 2017 21:10:41 +0000 (21:10 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
am:
0e1976292d -s ours
Change-Id: Ia0fb6afc42cb6bf1fb730ca7cee2f08c157890bb
Android Build Merger (Role) [Tue, 15 Aug 2017 20:47:03 +0000 (20:47 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
Charles He [Tue, 15 Aug 2017 20:42:11 +0000 (20:42 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
am:
159cd14334
Change-Id: Iaed779900e094a5951e24771ed1f1f55b0c1b014
Android Build Merger (Role) [Tue, 15 Aug 2017 20:35:00 +0000 (20:35 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
Change-Id: I4531fab8eab2291fcfd790d04a2661307f40dc60
Tony Mak [Tue, 15 Aug 2017 20:29:29 +0000 (20:29 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12
am:
f3589fded1 -s ours
Change-Id: I3b60e5cb94895fc155ba11d27ed81640eb8a2a05
TreeHugger Robot [Tue, 15 Aug 2017 19:30:53 +0000 (19:30 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
Charles He [Tue, 15 Aug 2017 17:54:35 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
Charles He [Tue, 15 Aug 2017 17:54:05 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
Charles He [Tue, 15 Aug 2017 17:53:35 +0000 (17:53 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
Charles He [Tue, 15 Aug 2017 17:52:57 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
Charles He [Tue, 15 Aug 2017 17:52:27 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
Charles He [Tue, 15 Aug 2017 17:51:58 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
Charles He [Tue, 15 Aug 2017 17:51:28 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
TreeHugger Robot [Tue, 15 Aug 2017 17:19:48 +0000 (17:19 +0000)]
Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
Andrii Kulian [Tue, 15 Aug 2017 16:26:04 +0000 (16:26 +0000)]
Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 16:03:28 +0000 (16:03 +0000)]
Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev
Tony Mak [Fri, 28 Jul 2017 10:53:56 +0000 (11:53 +0100)]
Enforce policy for camera gesture in keyguard
Test:
1. Set lock screen, set keyguard policy. Lock the device.
Observe that double tap is not showing camera
2. Set lock screen, unset the keyguard policy. Lock the device.
Observe that double tap is showing camera
3. Unset lock screen (swipe), set the keyguard policy. Lock the device.
Observe that double tap is showing camera.
4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.
Observe that double tap is showing camera.
Bug:
63787722
Merged-In: I104688eaad719528376e2851f837d5956a6a1169
Change-Id: I42e6d9015682998176fe41971356bde22e1b37b2
Justin Klaassen [Tue, 15 Aug 2017 03:01:36 +0000 (20:01 -0700)]
Update Qualcomm(R) aptX(TM) strings
Bug:
63899732
Test: Verified strings in Settings > System > Developer Options.
Change-Id: I21d764b0c11ff1cc934d379b2062ecc5a697624c
Winson Chung [Mon, 14 Aug 2017 23:44:20 +0000 (16:44 -0700)]
Add fallback to reset the waiting for transition state.
- When launching into recents directly in another orientation, it
appears that the animation start callback is not made, which then
causes the transition-waiting state to persist until Overview is
next hidden. As a fallback, if we get onEnterAnimationComplete()
on the activity, then the animation has started and completed, so
we can reset the state.
Bug:
64694148
Test: Launch fixed-portrait app, hold device in landscape and then hit
recents button, ensure that recents button still works after.
Change-Id: Ibac8554c1f71324838fef1f04db2d88b16ffe219
sunjian [Mon, 14 Aug 2017 22:45:04 +0000 (15:45 -0700)]
Fix Android O: AccountManager API not working in managed profile.
Bug:
64577509
Test: NONE
Change-Id: I25650b2002d392ef9b7f4f4732106b22bc0eaae2
Andrii Kulian [Mon, 14 Aug 2017 22:30:48 +0000 (15:30 -0700)]
Place black background only behind nav bar when letterboxed
Placing black background behind the entire app window causes
alpha animation issues, that can be visible as black flash to
user.
This CL sizes and positions the background only behind the
navigation bar area.
Bug:
64598822
Test: Open letterboxed app, go to/from Recents, observe animations.
Change-Id: I16a2243117f87ca513d5ef291b7c1d3779467f3b
TreeHugger Robot [Mon, 14 Aug 2017 22:13:32 +0000 (22:13 +0000)]
Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev
Felipe Leme [Tue, 1 Aug 2017 01:01:15 +0000 (18:01 -0700)]
Additional documentation about Autofill / WebView security.
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Fixes:
64114048
Fixes:
64337380
Fixes:
64125551
Change-Id: I375bb4712af875251fea4f3e572d92165643409a
Andrii Kulian [Fri, 11 Aug 2017 23:39:53 +0000 (16:39 -0700)]
Use fullscreen flag to define visibility of the background
Use fullscreen state provided by AM as a more reliable
source of truth to check if activity window hides other
windows behind.
Bug:
64615361
Test: Open Play Newsstand, click on article, go to and from Recents.
Change-Id: Ibc40a4241ed131f74da47c0d22833d2c3994cbe0
OSDN Git Service
