Makoto Onuki
de1e6e4d2d
Merge \\"Support multiple intents in ShortcutInfo\\" into nyc-mr1-dev am: b84ce2e034
...
am: 9a6109f284
Change-Id: I0f1caf54cc544db0b73f8e3275005923904f57a8
2016-07-20 23:15:32 +00:00
Makoto Onuki
9a6109f284
Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev
...
am: b84ce2e034
Change-Id: I53daa680bdf18505896a372e59c7b4bd73d4edca
2016-07-20 23:09:55 +00:00
Makoto Onuki
b84ce2e034
Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev
2016-07-20 23:05:31 +00:00
Adam Lesinski
984d575d2e
Merge \\"BatteryStats: Don\\'t print empty platform idle state\\" into nyc-mr1-dev am: ebbbead915
...
am: 7da697a79f
Change-Id: I644c302cc1cbea8b2387d9ac591845b7c43cc5c0
2016-07-20 22:10:44 +00:00
Adam Lesinski
7da697a79f
Merge \"BatteryStats: Don\'t print empty platform idle state\" into nyc-mr1-dev
...
am: ebbbead915
Change-Id: Ia651ad5a0a183ff7d70d90f119ec9238c15711ad
2016-07-20 22:05:38 +00:00
TreeHugger Robot
ebbbead915
Merge "BatteryStats: Don't print empty platform idle state" into nyc-mr1-dev
2016-07-20 21:56:02 +00:00
Makoto Onuki
440a1ea8e2
Support multiple intents in ShortcutInfo
...
Also fix b/30230996.
TODO: Support the sourceBounds argument to LauncherApps.
startShortcut().
Bug 30218829
Bug 30230996
Change-Id: Ibb6c59d5b7c0a320c21d09436d016d0eac94644f
2016-07-20 14:46:48 -07:00
Julia Reynolds
98aa59e407
Merge \\"Snooze schedule rules that were canceled by alarms.\\" into nyc-mr1-dev am: ae0aed951b
...
am: 261b655396
Change-Id: Icd0ff5a828d0f2a39bb0e39085cd9fd7788f354f
2016-07-20 20:51:12 +00:00
Julia Reynolds
261b655396
Merge \"Snooze schedule rules that were canceled by alarms.\" into nyc-mr1-dev
...
am: ae0aed951b
Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290
2016-07-20 20:45:13 +00:00
TreeHugger Robot
ae0aed951b
Merge "Snooze schedule rules that were canceled by alarms." into nyc-mr1-dev
2016-07-20 20:30:11 +00:00
Felipe Leme
4b3a0e2385
Merge \\"Improved storage size detection.\\" into nyc-mr1-dev am: f0de4da42f
...
am: d8b866e615
Change-Id: Ied4ea6aeb589ed0b64e16b40b8a7df2ddf50b99b
2016-07-20 19:27:02 +00:00
Felipe Leme
d8b866e615
Merge \"Improved storage size detection.\" into nyc-mr1-dev
...
am: f0de4da42f
Change-Id: I9794d1d3e15177c88e49911e1b406433025e85c4
2016-07-20 19:19:19 +00:00
TreeHugger Robot
f0de4da42f
Merge "Improved storage size detection." into nyc-mr1-dev
2016-07-20 19:06:12 +00:00
TreeHugger Robot
c5837520ba
Merge "Add per-user versions of set{Component,Application}EnabledSetting."
2016-07-20 18:58:56 +00:00
Julia Reynolds
fe58f1f386
Snooze schedule rules that were canceled by alarms.
...
So a reboot or snoozed alarm doesn't cause them to
reactivate.
Bug: 30087850
Change-Id: I83fdb88009b515d442993944aec40df7365e830f
2016-07-20 14:50:39 -04:00
Michael Wright
bc702e5d42
Merge commit \'f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d
...
am: 49bcc5dd80
Change-Id: Iee2a7015eefd6a75be2968ec855334f68ec5f79e
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
Sudheer Shanka
0e6bfff6c1
Add per-user versions of set{Component,Application}EnabledSetting.
...
Change-Id: Id63b233308e92a4c360f38d4728c519ac2131ff0
Fixes: 30230444
2016-07-20 10:30:57 -07: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
Change-Id: Id78b4ac49ee77a52d2e17f962e71328fb5cb4ba9
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
Change-Id: If169e5ab2a6241e6df720fa427a9eaee61d3cdc8
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
Change-Id: I29451b3dc161e29804f42f40aa9e15836979cd4a
2016-07-20 16:00:57 +00:00
Dianne Hackborn
af52a9d1bf
Merge \"Add reporting of long wake locks.\" into nyc-mr1-dev
...
am: ca37695ebc
Change-Id: I98b06d561945fddef5be4b749b5b2128b8622add
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
Change-Id: I9eb2556d72919f43e84336d57b6276028669f627
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
Change-Id: Iebc613fbecb372dbb39a9110c1b3123150b6ce5d
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
Change-Id: I946cd3820608cd6f33f62abd397cda51138a17d2
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
Change-Id: I8c9a6fe4778a3344e8c6270f865567ba4bf05dbb
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
Change-Id: I034ce5c4a115fa4b694569c66a7e764543191cf7
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
Change-Id: Ifff8f0ca783a601dab3b4968a0e9708e34aa83f4
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
Change-Id: I30b84189b2c2c4566c837cd1b8837053d6944988
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 .
Change-Id: I905e7435893fab49f03fdb708f4ab5a9d2c9cbae
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
Change-Id: I0c66444e1352af26bf7c039271a5bee952eb5e52
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
Change-Id: If26f5a2e8f2a0533b145025734e5819e72a48b28
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
Change-Id: Ia1d0a12f8ec520325ef0ece2c74faed0a51dbfd3
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
Change-Id: I5287b5cae2d18edc5dc2c5fbc2998c63fadbe583
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
Change-Id: I13f36de289f0990967e4e5fc967ea64ecfbc0ab8
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
Change-Id: Ie6abdf3303e9f91ae474aca112e39576685d0e5d
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