OSDN Git Service
TreeHugger Robot [Fri, 25 Aug 2017 21:27:56 +0000 (21:27 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
TreeHugger Robot [Fri, 25 Aug 2017 19:12:22 +0000 (19:12 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev
TreeHugger Robot [Wed, 23 Aug 2017 19:25:47 +0000 (19:25 +0000)]
Merge "power: throttle interaction hints" into oc-dev
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
TreeHugger Robot [Fri, 18 Aug 2017 00:40:55 +0000 (00:40 +0000)]
Merge "Fix race condition of removing surface." into oc-dev
Felipe Leme [Thu, 10 Aug 2017 23:39:02 +0000 (16:39 -0700)]
Clarified that getAutofillValue() must return same value passed to autofill().
Test: m doc-comment-check-docs
Bug:
64114048
Change-Id: I618cc3703db64315a848cc483f460f1b27fec98b
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
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
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
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
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
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
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
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
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
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
Cindy Kuang [Wed, 16 Aug 2017 16:59:31 +0000 (16:59 +0000)]
Merge "docs: corrected code example mistakes" into oc-dev
TreeHugger Robot [Tue, 15 Aug 2017 21:12:32 +0000 (21:12 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
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
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
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
Tony Mak [Fri, 11 Aug 2017 21:13:21 +0000 (21:13 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12
Change-Id: I3d7846f3b82dd429c69cff700e3d2794039b73db
Tony Mak [Fri, 11 Aug 2017 21:12:38 +0000 (21:12 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc
Change-Id: Iea1acc1d757871aaaa58fb27f547fd6261b73585
Tony Mak [Fri, 11 Aug 2017 21:11:51 +0000 (21:11 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc
Change-Id: I4ab24abc5c58022d92eb399750c8c8ef07995c5b
Tony Mak [Fri, 11 Aug 2017 21:10:58 +0000 (21:10 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a
Change-Id: Ic65e9bb19e46a8d16406a3d02e5b60f375338334
Tony Mak [Fri, 11 Aug 2017 21:09:58 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af
Change-Id: I877b0cba326b85e894d52f24a694a1ef666cdb1c
Tony Mak [Fri, 11 Aug 2017 21:09:21 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7
Change-Id: Ia91fe8b88c04f1b430f8cf90f5691b6b2791610b
Cindy Kuang [Fri, 11 Aug 2017 20:38:35 +0000 (20:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
Cindy Kuang [Fri, 11 Aug 2017 20:33:34 +0000 (20:33 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
Cindy Kuang [Wed, 9 Aug 2017 21:18:02 +0000 (14:18 -0700)]
docs: corrected code example mistakes
Test: make ds-docs
Bug:
10808505
Change-Id: I9ee4efab9f0cbac00213179d06a6f0919cb82756
TreeHugger Robot [Fri, 11 Aug 2017 12:25:01 +0000 (12:25 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
Cindy Kuang [Wed, 9 Aug 2017 17:08:15 +0000 (10:08 -0700)]
docs: replaced "i.e." to fix formatting error
Test: make ds-docs
Bug:
6440865
Change-Id: I428476ddfe55f14df531ea6a1c3e3a09f7a29e7d
Cindy Kuang [Wed, 9 Aug 2017 21:49:19 +0000 (14:49 -0700)]
docs: corrected grammar mistake in Class Overview
Test: make ds-docs
Bug:
17533073
Change-Id: Iaf22ad26794e2aac454a736efc746bca6f48eb82
Vinay Kalia [Wed, 9 Aug 2017 21:02:32 +0000 (21:02 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
Zheng Zhang [Wed, 9 Aug 2017 18:09:48 +0000 (18:09 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am:
9468b48565 -s ours
am:
4542686e42
Change-Id: Id140fee89f552999522f3116854761c14265ef04
Wei Wang [Wed, 9 Aug 2017 18:08:52 +0000 (18:08 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am:
2ed0166808 -s ours
am:
5d60709dc3
Change-Id: I10a42eee839da98af9434d1f7530335dfa732632
Zheng Zhang [Wed, 9 Aug 2017 17:58:18 +0000 (17:58 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
am:
9468b48565 -s ours
Change-Id: Ia1c10a46771ff4602a1005a3bf0bddaf6f1a70b6
Wei Wang [Wed, 9 Aug 2017 17:57:17 +0000 (17:57 +0000)]
Fix Wakelock underlock in GnssLocationProvider.
am:
2ed0166808 -s ours
Change-Id: I965a5b57ffbc2adcde3a83a95793a3dc29673641
Vinay Kalia [Fri, 28 Jul 2017 22:09:57 +0000 (15:09 -0700)]
Fix BLE scan leaks
If an app starts multiple scans with same callback then
there is a collision in mLeScanClients hash map which
results in leaking first scan. This change fixes it by
not allowing the second scan with same callback.
BUG:
62389939
BUG:
38198694
Test: Tested applications which started multiple scans with
same callback.
Change-Id: I569069a40b6f8b4b8bb070731225e732c6b23ec8
(cherry picked from commit
9722971cb4a79e37165f636f9dd057707d2e620a)
Kevin Hufnagle [Sat, 5 Aug 2017 00:03:48 +0000 (17:03 -0700)]
docs: Updated ShortcutManager API reference guide.
The guide now contains supplemental, rather than duplicate,
information relative to the "App Shortcuts" guide, available at
https://developer.android.com/guide/topics/ui/shortcuts.html
Test: make ds-docs -j8
Bug:
64401518
Change-Id: Iefa34299a9765eb5d853da71d9197a0edb346026
Felipe Leme [Mon, 31 Jul 2017 18:34:14 +0000 (11:34 -0700)]
Clarifies autofill lifecycle.
Test: m update-api
Bug:
64125551
Bug:
64114048
Change-Id: I17c5bc2e2e64fa27e877301dbcb983ac8497209e
Zheng Zhang [Mon, 7 Aug 2017 20:51:23 +0000 (13:51 -0700)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug:
64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
Wei Wang [Tue, 2 May 2017 03:24:19 +0000 (20:24 -0700)]
Fix Wakelock underlock in GnssLocationProvider.
Added a separate wakelock for xtra download so it won't
interfer with any wakelocks.
Test: manual
Bug:
37545729
Change-Id: I0867166f03802d1ed133437bcd85b0062db69947
TreeHugger Robot [Wed, 2 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Merge "camera2: Fix template requirements" into oc-dev
Felipe Leme [Wed, 2 Aug 2017 15:52:05 +0000 (15:52 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
Andrew Solovay [Tue, 1 Aug 2017 21:20:59 +0000 (21:20 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: I348e71eac5076b37ca50fa1d4cf87afd9890eb2a
Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Felipe Leme [Mon, 31 Jul 2017 18:34:14 +0000 (11:34 -0700)]
Clarifies how the autofill service should check for signature hashes.
Test: m update-api
Bug:
64125551
Fixes:
63991811
Change-Id: I1ba66787ef91c0fc5fab20b5e9e9fd47aee46412
Maggie Lee [Tue, 1 Aug 2017 15:03:25 +0000 (15:03 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276
am:
d88f4b723d
Change-Id: I3ab78b1e1ca41f6736f7b51f0bf7f603dda1dc8e
Andriy Naborskyy [Tue, 1 Aug 2017 14:56:17 +0000 (14:56 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26
am:
502986f72a
Change-Id: I261e7478acd0e1e8330536b2694ff164d5e51db9
Hugo Benichi [Tue, 1 Aug 2017 14:55:23 +0000 (14:55 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Ic8e234914839f9e98fed944638d85c2e795c0c9d
Maggie Lee [Tue, 1 Aug 2017 14:47:57 +0000 (14:47 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd
am:
b5da08a276
Change-Id: I5d96dd73affe79880583347e32a95be8510a5462
Andriy Naborskyy [Tue, 1 Aug 2017 14:38:26 +0000 (14:38 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b
am:
9295f58d26
Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7
Maggie Lee [Tue, 1 Aug 2017 14:37:40 +0000 (14:37 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
am:
33676dddbd
Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29
Hugo Benichi [Tue, 1 Aug 2017 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours
am:
ff55799950 -s ours
Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
am:
f18599a15b
Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f
Hugo Benichi [Tue, 1 Aug 2017 14:30:02 +0000 (14:30 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am:
456b91561d -s ours
Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad
Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking
Andrew Solovay [Tue, 1 Aug 2017 02:13:38 +0000 (19:13 -0700)]
docs: Noted that JobIntentService is usually a better choice
Since IntentService is subject to the O background restrictions,
most devs are better off switching to the new JobIntentService.
(I assume IntentService is not actually deprecated; if it is, tell
me and I'll change this to a @deprecated tag!)
See first comment for doc stage location.
Test: make ds-docs
Bug:
64159987
Change-Id: I83a53d1e6336c2134bf4c61bedd2ae42cd80493a
Tyler Freeman [Tue, 1 Aug 2017 01:44:16 +0000 (01:44 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I42768a60dd38d276cc013a66c5af9aecd06b755d
Tyler Freeman [Tue, 1 Aug 2017 01:33:44 +0000 (01:33 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours
am:
65d806d043 -s ours
Change-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b
Tyler Freeman [Tue, 1 Aug 2017 01:24:08 +0000 (01:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
am:
a053eaa841 -s ours
Change-Id: If8383edac561ad83edf182ee1c6e9687b180a1c2
Tyler Freeman [Tue, 1 Aug 2017 01:10:44 +0000 (01:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
z00208928 [Fri, 21 Jul 2017 14:26:29 +0000 (22:26 +0800)]
power: gps: add gps read timeout
During download gps file, if network is disconnected, it do not release wakelock
to prevent system to sleep and consume more power until network is connected.
So set gps read tiemout.
Bug:
33469278
Change-Id: I41adf137559d88f76d9da6f63585bfdefc3117b1
Signed-off-by: z00208928 <zhangwei519@huawei.com>
OSDN Git Service
