Michael Wright
bc702e5d42
Merge commit \'f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d
...
am: 49bcc5dd80
2016-07-20 18:49:43 +00:00
Michael Wright
49bcc5dd80
Merge commit 'f8bc27d9683e4089cdfd778dcb61ae67f44665b7' into manual_merge_f8bc27d
2016-07-20 19:41:58 +01:00
TreeHugger Robot
f8bc27d968
Merge "Rename color transform to color mode and persist the value." into nyc-mr1-dev
2016-07-20 17:21:35 +00:00
Phil Weaver
3c11ac82b9
Merge \\"Suppress exceptions for corner-case a11y events.\\" into nyc-mr1-dev am: 39abe33b50
...
am: 5c749b8254
2016-07-20 17:03:37 +00:00
Phil Weaver
5c749b8254
Merge \"Suppress exceptions for corner-case a11y events.\" into nyc-mr1-dev
...
am: 39abe33b50
2016-07-20 16:57:52 +00:00
Phil Weaver
39abe33b50
Merge "Suppress exceptions for corner-case a11y events." into nyc-mr1-dev
2016-07-20 16:46:42 +00:00
Dianne Hackborn
e0b1f592a0
Merge \\"Add reporting of long wake locks.\\" into nyc-mr1-dev am: ca37695ebc
...
am: af52a9d1bf
2016-07-20 16:00:57 +00:00
Dianne Hackborn
af52a9d1bf
Merge \"Add reporting of long wake locks.\" into nyc-mr1-dev
...
am: ca37695ebc
2016-07-20 15:53:17 +00:00
Dianne Hackborn
ca37695ebc
Merge "Add reporting of long wake locks." into nyc-mr1-dev
2016-07-20 15:45:36 +00:00
Kevin Hufnagle
8af36d225d
Merge \\\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52 am: b9487874fe am: 55b52a2b3f am: 87a8e5eebd
...
am: 6aa834498b
2016-07-20 03:02:15 +00:00
Svetoslav Ganov
d5fde61c75
Merge \\"Revert \\"Prevent apps to overlay other apps via toast windows\\"\\" into nyc-mr1-dev am: 78fa7a1b3f
...
am: d6c4cf03e3
2016-07-20 03:02:12 +00:00
Kevin Hufnagle
6aa834498b
Merge \\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52 am: b9487874fe am: 55b52a2b3f
...
am: 87a8e5eebd
2016-07-20 01:35:56 +00:00
Kevin Hufnagle
87a8e5eebd
Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52 am: b9487874fe
...
am: 55b52a2b3f
2016-07-20 01:28:59 +00:00
Kevin Hufnagle
55b52a2b3f
Merge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52
...
am: b9487874fe
2016-07-20 01:20:20 +00:00
Kevin Hufnagle
b9487874fe
Merge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d
...
am: a812012c52
2016-07-20 01:12:40 +00:00
Svetoslav Ganov
d6c4cf03e3
Merge \"Revert \"Prevent apps to overlay other apps via toast windows\"\" into nyc-mr1-dev
...
am: 78fa7a1b3f
2016-07-20 01:12:15 +00:00
Svetoslav Ganov
78fa7a1b3f
Merge "Revert "Prevent apps to overlay other apps via toast windows"" into nyc-mr1-dev
2016-07-20 01:04:52 +00:00
Svetoslav Ganov
f1395d730a
Revert "Prevent apps to overlay other apps via toast windows"
...
This reverts commit b3b22cba86
2016-07-20 01:00:51 +00:00
Kevin Hufnagle
d312201b74
Merge "docs: Updated descriptions of device orientation angles." into mnc-docs
2016-07-20 00:45:09 +00:00
Makoto Onuki
e1f90ac94a
Merge \\"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\\" into nyc-mr1-dev am: ceadb1a86a
...
am: c74ed0d6dc
2016-07-20 00:32:17 +00:00
Makoto Onuki
c74ed0d6dc
Merge \"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\" into nyc-mr1-dev
...
am: ceadb1a86a
2016-07-20 00:24:42 +00:00
Makoto Onuki
ceadb1a86a
Merge "Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when..." into nyc-mr1-dev
2016-07-19 23:57:32 +00:00
Phil Weaver
890202bde4
Suppress exceptions for corner-case a11y events.
...
Apps are told to query AccessibilityManager#isEnabled before
calling sendAccessibilityEvent. If accessibility is disabled
between the two calls, an app can crash. We can guarantee that
this won't happen on a process's main thread, but guaranteeing
it for all threads is messier. Rather than add the complexity
of tracking the state for all threads, only log an error in the
corner case that an accessibility event is requested on a
thread that doesn't have the process's main looper.
Bug: 28985452
Change-Id: I8369deefd83b0a6b04936ddfce55c53147756f1f
2016-07-19 16:44:28 -07:00
Mikhail Naganov
232ac757fb
Merge "Protect MIDI framework against client blocks in MidiReceiver.onSend"
2016-07-19 22:50:06 +00:00
Dianne Hackborn
d0db6f0043
Add reporting of long wake locks.
...
These appear as a new event in the battery stats history,
"longwake" in the long version and "Elw" in the checkin.
The power manager keeps track of which wake locks are held
for a long time and reports them to battery stats. Long
is currently considered 1 minute or more. Once it is long,
the start event will appear, and once if is released the
event will end.
In the case of a wake lock changing (typically its work
source changing), for purposes of this accounting this is
considering a pure release of the old state and start of
the new state... so the timer will reset back to one
minute until the wake lock is considered long. This is done
to prevent things that make lots of changes to wake lock
work sources from spamming the log.
Bug: 28753137
Change-Id: I33b6168c57a7ea6ea558273dec731704123124a5
2016-07-19 14:16:50 -07:00
Michael Kwan
b20f4f0efb
Merge \\"Fix padding on round devices for AlertDialogs.\\" into nyc-mr1-dev am: 0cd4addd36
...
am: e42b256d0d
2016-07-19 19:12:00 +00:00
Michael Kwan
e42b256d0d
Merge \"Fix padding on round devices for AlertDialogs.\" into nyc-mr1-dev
...
am: 0cd4addd36
2016-07-19 18:57:11 +00:00
TreeHugger Robot
0cd4addd36
Merge "Fix padding on round devices for AlertDialogs." into nyc-mr1-dev
2016-07-19 18:48:31 +00:00
TreeHugger Robot
8fedc0e857
Merge "Updated JavaDoc for getApplicationRestrictions"
2016-07-19 18:46:44 +00:00
Yuichi Biwa
9cead0d166
Merge \\"ChooserActivity: Cannot start app that the icon overflows the layout\\" into nyc-mr1-dev am: 586f23c14b
...
am: 8b059e8aa1
2016-07-19 18:38:52 +00:00
Yuichi Biwa
8b059e8aa1
Merge \"ChooserActivity: Cannot start app that the icon overflows the layout\" into nyc-mr1-dev
...
am: 586f23c14b
2016-07-19 18:33:40 +00:00
Makoto Onuki
347a6bd820
Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...
...
starting a shortcut.
- Also add API surface to support launching multiple intents
- Also add SM.isRateLimitingActive() which was supposed to be
added but was not due to a bad rebase.
Bug 30218829
Change-Id: I82d60ec0df1e2b889538705f9f8870ee727dd55d
2016-07-19 11:17:12 -07:00
Fyodor Kupolov
4e9af06576
Updated JavaDoc for getApplicationRestrictions
...
The method performs disk I/O and shouldn't be called on the main thread.
Bug: 28303952
Change-Id: Iab4d79158b32858baac4147ab73c6ac7aaa51b5b
2016-07-19 10:28:31 -07:00
Michael Kwan
814508166c
Fix padding on round devices for AlertDialogs.
...
Bug: 27482353
Change-Id: Ic9ee4abe84f9172db64dba398af2c0058921fa3f
2016-07-19 10:18:41 -07:00
Yuichi Biwa
4f3a843ea9
ChooserActivity: Cannot start app that the icon overflows the layout
...
Symptom:
When sharing an image from Album, ChooserActivity can be shown.
But then the app to be located to the bottom part of the list may not
be started even if user tap it.
Root cause:
ChooserActivity uses ResolverDrawerLayout. And ResolverDrawerLayout
can display only some items on the list (known as "Collapse mode").
When the item clipping along the bottom edge is tapped by the user,
ResolverDrawerLayout tries to expand the list and scroll it to a
better position, instead of starting an application.
In this problem case, ResolverDrawerLayout continues to try to expand
the list whenever tapping, so an application will never start.
Solution:
Change a condition so that mOpenOnClick becomes true only when the list
has been collapsed (mCollapseOffset > 0).
Bug: 30153542
Change-Id: I576fb6c8b6a91d79c1e0d46d069146779f4dbd17
2016-07-19 10:04:41 -07:00
Nicolas Prévot
77dbac341a
Merge \\"Don\\'t append userIds for the current user\\'s clipData uris.\\" into nyc-mr1-dev am: e723ed8b51
...
am: 91b6f5e44f
2016-07-19 16:20:14 +00:00
Nicolas Prevot
91b6f5e44f
Merge \"Don\'t append userIds for the current user\'s clipData uris.\" into nyc-mr1-dev
...
am: e723ed8b51
2016-07-19 16:15:27 +00:00
Nicolas Prévot
e723ed8b51
Merge "Don't append userIds for the current user's clipData uris." into nyc-mr1-dev
2016-07-19 16:06:44 +00:00
TreeHugger Robot
c1b775584d
Merge "Remove synchronized from static methods in WebView."
2016-07-19 11:42:01 +00:00
Justin Klaassen
3fac1a8c5c
Merge \\"Cleanup TwilightService\\" into nyc-mr1-dev am: e5aeca3dc9
...
am: 6c02076e73
2016-07-19 02:16:25 +00:00
Justin Klaassen
6c02076e73
Merge \"Cleanup TwilightService\" into nyc-mr1-dev
...
am: e5aeca3dc9
2016-07-19 02:11:00 +00:00
Justin Klaassen
6384878d69
Cleanup TwilightService
...
TwilightService now just reports the current twilight state, it's up to
clients to provide their own locking mechanism (e.g. always day or
night).
Bug: 29620105
Change-Id: I2a8bb544eab0f44d269c59f36a53fbdf842b423a
2016-07-18 16:57:15 -07:00
Svetoslav Ganov
f6d56f92ff
Merge "Update windows before sending a window state change event"
2016-07-18 21:54:14 +00:00
Adam Lesinski
daa3e9cd80
Merge \\"Record UID of wakeup packets\\" into nyc-mr1-dev am: 117cf8de91
...
am: d279c1291e
2016-07-18 21:29:56 +00:00
Hongming Jin
280a87d3a5
Merge "AccountManager: Make account session APIs public api."
2016-07-18 21:24:08 +00:00
Adam Lesinski
d279c1291e
Merge \"Record UID of wakeup packets\" into nyc-mr1-dev
...
am: 117cf8de91
2016-07-18 21:15:48 +00:00
Jim Miller
6097da897a
Merge \\"Fix vulnerability in LockSettings service\\" into nyc-mr1-dev am: 6ad9c16ffd
...
am: 623362c5ab
2016-07-18 21:15:43 +00:00
Jim Miller
623362c5ab
Merge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev
...
am: 6ad9c16ffd
2016-07-18 21:09:37 +00:00
TreeHugger Robot
117cf8de91
Merge "Record UID of wakeup packets" into nyc-mr1-dev
2016-07-18 20:58:15 +00:00
TreeHugger Robot
6ad9c16ffd
Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev
2016-07-18 20:54:45 +00:00
