OSDN Git Service
Amith Yamasani [Tue, 21 Jul 2015 20:18:02 +0000 (20:18 +0000)]
am
09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev
* commit '
09ba71513ba3bb092eb3effbe45953c50430ff20':
Don't kill apps that are multi-user aware...
Amith Yamasani [Tue, 21 Jul 2015 20:04:19 +0000 (20:04 +0000)]
Merge "Don't kill apps that are multi-user aware..." into mnc-dev
Alex Klyubin [Tue, 21 Jul 2015 20:02:21 +0000 (20:02 +0000)]
am
5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev
* commit '
5d586dd585a6663290b68abce433a75b5760fc5d':
KM module may consume less input than provided by finish time.
Alex Klyubin [Tue, 21 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "KM module may consume less input than provided by finish time." into mnc-dev
Adam Lesinski [Tue, 21 Jul 2015 19:40:24 +0000 (19:40 +0000)]
am
23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '
23e19066de2caf1db1fa0759ac49a1118b59f7a5':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Christopher Tate [Tue, 21 Jul 2015 19:28:04 +0000 (19:28 +0000)]
am
d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '
d9c2ff99bf9469f155eabf341880d055741e9db5':
Add 'pm' operation to set a package's app-linking state
Adam Lesinski [Tue, 21 Jul 2015 19:26:43 +0000 (19:26 +0000)]
Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
Svetoslav [Tue, 21 Jul 2015 19:12:13 +0000 (19:12 +0000)]
am
81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
* commit '
81adda25b396ee3db794bc9a7946b579d01c2aa0':
Always create nodes for views backed by an adapter.
Christopher Tate [Tue, 21 Jul 2015 19:11:34 +0000 (19:11 +0000)]
Merge "Add 'pm' operation to set a package's app-linking state" into mnc-dev
Adam Lesinski [Tue, 21 Jul 2015 19:08:56 +0000 (12:08 -0700)]
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Previously we tried to read /d/wakeup_sources to gather kernel wakelock data. If that
fails we used the older sys file /proc/wakelocks.
N7 has both /proc/wakelocks and /d/wakeup_sources, but /proc/wakelocks
has the actual data we need. All other devices are using /d/wakeup_sources, so
only N7 experienced a loss of kernel wakelock data.
The original regression was introduced here: ag/659258
Bug:
22556242
Change-Id: I51ec68e957f587bc1466e24f0a1dbc8cd7753ac6
Svetoslav [Tue, 21 Jul 2015 19:01:05 +0000 (19:01 +0000)]
Merge "Always create nodes for views backed by an adapter." into mnc-dev
Amith Yamasani [Tue, 21 Jul 2015 18:46:14 +0000 (11:46 -0700)]
Don't kill apps that are multi-user aware...
... when looking for background user apps that hold RECORD_AUDIO
permission.
On switching users, we kill any apps that might potentially be
recording audio. But we don't want to kill critical apps that need
to stay running because of multi-user aware services.
Bug:
22564430
Change-Id: I6d9a684d4e044cc3018f0f8181a44aa143a3baeb
Todd Kennedy [Tue, 21 Jul 2015 18:21:33 +0000 (18:21 +0000)]
am
f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
* commit '
f2805bcbe1c99ce806448a2d8c0f12b142c7cece':
Use RingtonePlayer to get ringtone title
Todd Kennedy [Tue, 21 Jul 2015 18:11:16 +0000 (18:11 +0000)]
Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
Nick Kralevich [Tue, 21 Jul 2015 17:25:30 +0000 (17:25 +0000)]
am
673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
* commit '
673ccfd45a81482d97eecf76dc0fef0dfd57be73':
UsbDeviceManager: add back support for USB overlays
Nick Kralevich [Tue, 21 Jul 2015 17:16:07 +0000 (17:16 +0000)]
Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
Raph Levien [Tue, 21 Jul 2015 17:04:36 +0000 (17:04 +0000)]
am
1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
* commit '
1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc':
Respect style boundaries when measuring text
Raph Levien [Tue, 21 Jul 2015 16:55:37 +0000 (16:55 +0000)]
Merge "Respect style boundaries when measuring text" into mnc-dev
Diego Perez [Tue, 21 Jul 2015 15:50:11 +0000 (15:50 +0000)]
am
66e66831: Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
* commit '
66e6683193f6a1d071710ea8a39b02f5129fc505':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 15:41:08 +0000 (15:41 +0000)]
Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
Wale Ogunwale [Tue, 21 Jul 2015 14:38:04 +0000 (14:38 +0000)]
am
e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev
* commit '
e99f20f5873c00b35f2407e28e06ff9119f85088':
Don't duplicate recent tasks of the same affinity.
Diego Perez [Tue, 21 Jul 2015 14:28:10 +0000 (15:28 +0100)]
resolved conflicts for merge of
112d8a36 to mnc-dev
Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2
Wale Ogunwale [Tue, 21 Jul 2015 14:28:13 +0000 (14:28 +0000)]
Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev
Wale Ogunwale [Mon, 20 Jul 2015 22:43:37 +0000 (15:43 -0700)]
Don't duplicate recent tasks of the same affinity.
In change
510e554283d3dc250f836cd3e4abc36d87319333 we stated
limiting the number of document activity entries in recents
by comparing the realActivity of the tasks. This compared was
done for all tasks not just document tasks there by breaking
the use of task affinity to remove tasks with the same affinity
from recent task list. This change limits the compare of
realActivity to just document tasks.
Bug:
22564474
Bug:
18642190
Change-Id: Idc21ec311f194ab2005cb22380ca56303ae0ad94
Diego Perez [Tue, 21 Jul 2015 13:20:23 +0000 (13:20 +0000)]
am
d6f2a9ef: am
7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit '
d6f2a9efbb0e0525f6cf970fd9c9b9b7082b19f9':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 13:06:52 +0000 (13:06 +0000)]
am
7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit '
7720eb18c1c2fe06e8f4b2f6e2936a4072494da8':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 12:56:50 +0000 (12:56 +0000)]
Merge "Render to measured size when using expand mode" into lmp-mr1-dev
Christopher Tate [Mon, 20 Jul 2015 22:39:39 +0000 (15:39 -0700)]
Add 'pm' operation to set a package's app-linking state
Set an app's state:
pm set-app-link [--user USER_ID] PACKAGE {always|ask|never|undefined}
Read an app's current state:
pm get-app-link [--user USER_ID] PACKAGE
The latter prints to stdout one of the strings usable as an argument to
set-app-link. If an error is encountered, the string printed to
stderr begins with "Error: ".
Bug
19628527
Change-Id: I68b6dc24445917807345a8cf5baa2078490740af
Todd Kennedy [Mon, 20 Jul 2015 20:32:40 +0000 (13:32 -0700)]
Use RingtonePlayer to get ringtone title
Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.
Bug:
22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce
Jae Seo [Tue, 21 Jul 2015 00:10:47 +0000 (00:10 +0000)]
am
b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
* commit '
b2eed1d6e11f38c00ce1776ade14dfa004c6119f':
TIF: Get or create the user state when failed to find existing one
Terry Heo [Tue, 21 Jul 2015 00:10:43 +0000 (00:10 +0000)]
am
e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
* commit '
e95af4ab8bda68ee80bf4d444356e0c1afb1fe99':
TIF: Use copied track list for onTracksChanged() callback
Jae Seo [Mon, 20 Jul 2015 23:59:22 +0000 (23:59 +0000)]
Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
Terry Heo [Mon, 20 Jul 2015 23:57:28 +0000 (23:57 +0000)]
Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
Dongwon Kang [Mon, 20 Jul 2015 23:56:37 +0000 (23:56 +0000)]
am
6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
* commit '
6444fe121449f1cacf4500d3098b590c74e3646d':
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
Jorim Jaggi [Mon, 20 Jul 2015 23:56:33 +0000 (23:56 +0000)]
am
55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
* commit '
55786e1164d522d878d1f493c30330669b1fd868':
Test app to emit all AccessibilityEvents to logcat.
Dongwon Kang [Mon, 20 Jul 2015 23:49:59 +0000 (23:49 +0000)]
Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 23:45:46 +0000 (23:45 +0000)]
am
1f98c62f: Fix unnecessary layer creation for appear animation
* commit '
1f98c62f9a60fedd8f18bd47e3f3c4e5fcb34031':
Fix unnecessary layer creation for appear animation
Miao Wang [Mon, 20 Jul 2015 23:45:42 +0000 (23:45 +0000)]
am
15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
* commit '
15d6894170f2ee1a6eae57c915fcc27a56c9de17':
[RenderScript] Add docs advising users about dstAtop bug.
Jorim Jaggi [Mon, 20 Jul 2015 23:45:37 +0000 (23:45 +0000)]
am
4cd72169: Fix window animation flickering
* commit '
4cd7216967a3e6211785c8acdeca449d61d796a0':
Fix window animation flickering
Jorim Jaggi [Mon, 20 Jul 2015 23:43:48 +0000 (23:43 +0000)]
Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 18:43:27 +0000 (11:43 -0700)]
Fix unnecessary layer creation for appear animation
Bug:
22561692
Change-Id: I9e5a52f8113d1cbb5afba61d7979770c2dddc5ed
Miao Wang [Mon, 20 Jul 2015 23:37:44 +0000 (23:37 +0000)]
Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 18:54:26 +0000 (11:54 -0700)]
Fix window animation flickering
Bug:
22502673
Change-Id: I939e5840e10f3c0582148a5a01908076f994ae69
Jorim Jaggi [Mon, 20 Jul 2015 23:24:21 +0000 (23:24 +0000)]
am
8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
* commit '
8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
Fix SysUI crashes on svelte devices
Raph Levien [Mon, 20 Jul 2015 23:22:01 +0000 (16:22 -0700)]
Respect style boundaries when measuring text
The existing implementation of handleText() in TextLine laid out
text to the end of the context. However, in cases where the text is
broken into multiple style spans, it's only valid to lay out up to
the end of the style span. This can lead to inconsistent
measurements, especially in the presence of legitimate zero-width
characters such as bidi control characters and zero width space.
This patch changes the invocation of getRunAdvance to measure only
within the style span.
Bug:
22589743
Change-Id: I027f5e77db27ddf9596ef20adcad7e62a82b41de
Jae Seo [Mon, 20 Jul 2015 23:15:01 +0000 (16:15 -0700)]
TIF: Get or create the user state when failed to find existing one
Bug:
22560640
Change-Id: Idc56dc2b16319d173f005fc236f91f70d1a93fad
Jorim Jaggi [Mon, 20 Jul 2015 23:09:44 +0000 (23:09 +0000)]
Merge "Fix SysUI crashes on svelte devices" into mnc-dev
Miao Wang [Mon, 20 Jul 2015 22:05:31 +0000 (15:05 -0700)]
[RenderScript] Add docs advising users about dstAtop bug.
Bug:
22047392
Change-Id: I736a697276020687c20dff515aabb1be1776f8c0
Dongwon Kang [Mon, 20 Jul 2015 22:59:53 +0000 (15:59 -0700)]
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
AudioSystem.isStreamActive() includes a blocking IPC, so it shouldn't be called
in MSR.adjustVolume() which is called from MediaSessionService while holding a
lock.
Bug:
22606983
Change-Id: I3ab94e73731176d9bf80dbc2121702025547114c
Alan Viverette [Mon, 20 Jul 2015 22:59:37 +0000 (22:59 +0000)]
am
41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
* commit '
41668b259dfa997492e3f4d331fee88b7f9f2453':
Adjust padding and font size in time picker for Large text mode
Alan Viverette [Mon, 20 Jul 2015 22:59:33 +0000 (22:59 +0000)]
am
001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
* commit '
001f1e7eb35630df24d53298c1a3d2de055d7ce9':
Add missing invalidation check to drawable cache
Alan Viverette [Mon, 20 Jul 2015 22:48:26 +0000 (22:48 +0000)]
Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 21:44:55 +0000 (14:44 -0700)]
Fix SysUI crashes on svelte devices
Bug:
22602295
Change-Id: Idac0d62683c0f6f7cf7b795967632e34d771c4f7
Alan Viverette [Mon, 20 Jul 2015 22:44:30 +0000 (22:44 +0000)]
Merge "Add missing invalidation check to drawable cache" into mnc-dev
Simranjit Singh Kohli [Mon, 20 Jul 2015 22:44:18 +0000 (22:44 +0000)]
am
02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after cleari
* commit '
02aff29c396373acc16be159c8c4ed59f61faaed':
[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
Dianne Hackborn [Mon, 20 Jul 2015 22:44:13 +0000 (22:44 +0000)]
am
a7ce2344: Merge "Fix issue #
22564918: Request is inactive" into mnc-dev
* commit '
a7ce23440328e63f36a4add05199aa84ff04032d':
Fix issue #
22564918: Request is inactive
Nick Kralevich [Mon, 20 Jul 2015 22:36:21 +0000 (15:36 -0700)]
UsbDeviceManager: add back support for USB overlays
Commit
fcf10f7c12cb3107bdfedce6f76a8c866d154f3c removed support for USB
overlays. Add it back in, as some devices depend on it.
Bug:
22062484
Bug:
21195124
Change-Id: I74d12699201355b07475744c641e31fdc4bb5a4a
Simranjit Singh Kohli [Mon, 20 Jul 2015 22:39:49 +0000 (22:39 +0000)]
Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity." into mnc-dev
Dianne Hackborn [Mon, 20 Jul 2015 22:34:46 +0000 (22:34 +0000)]
Merge "Fix issue #
22564918: Request is inactive" into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 22:21:50 +0000 (22:21 +0000)]
am
86b273f1: Fix jank in swipe-up to unlock
* commit '
86b273f1cc59185a14d5bab8a3f4db30c1a4c8a9':
Fix jank in swipe-up to unlock
Jorim Jaggi [Mon, 20 Jul 2015 22:01:23 +0000 (22:01 +0000)]
am
f8763581: Allow navigation bar drawing during window animations
* commit '
f87635813cabbf4f7dc0236fffc6b07a2715aff3':
Allow navigation bar drawing during window animations
Jorim Jaggi [Wed, 15 Jul 2015 01:08:43 +0000 (18:08 -0700)]
Fix jank in swipe-up to unlock
Some stuff is slow in the swipe-up to unlock transition. Introduce
DejankUtils to execute it when RenderThread is doing its work.
Bug:
22205322
Change-Id: I7089f0a1bdca13ad13a1e305a7bff32276a3cd53
Dianne Hackborn [Mon, 20 Jul 2015 21:49:58 +0000 (14:49 -0700)]
Fix issue #
22564918: Request is inactive
Add Request.isActive() API. Also improve documentation to tell
people what things cause it to become inactive. And fix a race
where we were modifying the active list from outside the main
thread without locking it.
Change-Id: I9248e014126cb121612edbe595108ace753456e2
Jorim Jaggi [Mon, 20 Jul 2015 19:19:52 +0000 (12:19 -0700)]
Allow navigation bar drawing during window animations
Bug:
22605259
Change-Id: I080dc7bf2dfdc6666a5f38eebecc7c9a6034d04a
Roozbeh Pournader [Mon, 20 Jul 2015 21:23:47 +0000 (21:23 +0000)]
am
2dc6ebbe: Merge "Fix default value of stereoReset() in the documentation." into mnc-dev
* commit '
2dc6ebbea8a72e90bc66cac84b15ae3ce5898536':
Fix default value of stereoReset() in the documentation.
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:23:43 +0000 (21:23 +0000)]
am
437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
* commit '
437eb6ce483a34e28c06d70c0b408ba4a495293a':
Fix: Wrong suggestion popup position in extract mode.
Robert Greenwalt [Mon, 20 Jul 2015 21:23:38 +0000 (21:23 +0000)]
am
b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev
* commit '
b0e4a9e8a4367cbc3c7f08f7f95cfa0c9397fdaf':
Support optional modem restart on certain errors.
Roozbeh Pournader [Mon, 20 Jul 2015 21:20:00 +0000 (21:20 +0000)]
Merge "Fix default value of stereoReset() in the documentation." into mnc-dev
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:12:36 +0000 (21:12 +0000)]
Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
Robert Greenwalt [Mon, 20 Jul 2015 21:10:39 +0000 (21:10 +0000)]
Merge "Support optional modem restart on certain errors." into mnc-dev
Svetoslav [Mon, 20 Jul 2015 21:00:58 +0000 (14:00 -0700)]
Always create nodes for views backed by an adapter.
Some views are backed by adapter and if the adapter changed
but views are not updated we were not reporting the views.
This is not correct as the accessibility layer should always
access whatever is on the screen regardless if we know it
will change in the next layout pass.
bug:
20920903
Change-Id: I5851c886848e7b8e59b76419c22124790d7e6f05
Jason Monk [Mon, 20 Jul 2015 20:55:19 +0000 (20:55 +0000)]
am
33c619bb: Merge "Fix hotspot brokenness" into mnc-dev
* commit '
33c619bb52c9e3e62b7243c9b1d9a75189885427':
Fix hotspot brokenness
Jae Seo [Mon, 20 Jul 2015 20:55:14 +0000 (20:55 +0000)]
am
26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev
* commit '
26f7720ed0d6a0894772d82b7ebed03ac686c6f3':
MediaSession: Do not lock on AudioManager.getStreamVolume
Jeff Sharkey [Mon, 20 Jul 2015 20:55:09 +0000 (20:55 +0000)]
am
35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev
* commit '
35ba2cdbf8654d708e57d209131dd498705d0e18':
Inherit ABI when moving existing install.
Jason Monk [Mon, 20 Jul 2015 20:47:15 +0000 (20:47 +0000)]
Merge "Fix hotspot brokenness" into mnc-dev
Jae Seo [Mon, 20 Jul 2015 20:45:07 +0000 (20:45 +0000)]
Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 20:44:53 +0000 (20:44 +0000)]
Merge "Inherit ABI when moving existing install." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 20:40:18 +0000 (13:40 -0700)]
Inherit ABI when moving existing install.
Previously installed apps are moved between volumes as an complete
package, including any previously unpacked native libraries. This
means we need to inherit any previously derived ABI when moving.
Bug:
22093837
Change-Id: I7656e338affa44e7f997fe4aa95bb297c0acc165
Roozbeh Pournader [Mon, 20 Jul 2015 20:40:10 +0000 (20:40 +0000)]
am
9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
* commit '
9bdb7bfd35a4b1faa5cbafeb3f1e20ff34e7b0e1':
Bidi-wrap the results of format[Short]FileSize().
Roozbeh Pournader [Mon, 20 Jul 2015 20:30:37 +0000 (20:30 +0000)]
Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
Alan Viverette [Mon, 20 Jul 2015 20:28:21 +0000 (16:28 -0400)]
Adjust padding and font size in time picker for Large text mode
Bug:
22514034
Change-Id: I9ad22f2d14565b67558f2a48b2c160e05c23f81c
Alan Viverette [Mon, 20 Jul 2015 20:03:04 +0000 (16:03 -0400)]
Add missing invalidation check to drawable cache
Bug:
22478448
Change-Id: Ic9da1898cd921d8c133ef5397fc97a664601a863
Geoff Mendal [Mon, 20 Jul 2015 20:02:37 +0000 (20:02 +0000)]
am
a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a6bf393dc5b022f11c698dda610e209b5090d8c0':
Import translations. DO NOT MERGE
Dianne Hackborn [Mon, 20 Jul 2015 20:02:32 +0000 (20:02 +0000)]
am
78ead58d: Merge "Fix issue #
22531747: Assist info should declare if user has disabled..." into mnc-dev
* commit '
78ead58df03e476d656c7e875fff9ade13b727c1':
Fix issue #
22531747: Assist info should declare if user has disabled...
Geoff Mendal [Mon, 20 Jul 2015 19:58:35 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 20 Jul 2015 19:53:55 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I08703b57a1fe0b578bcb7e5f2a2e7d9c2904526f
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Jul 2015 19:51:19 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I41156105dcb753a1d9338cdbacebe03d2b4b4f1d
Auto-generated-cl: translation import
Dianne Hackborn [Mon, 20 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "Fix issue #
22531747: Assist info should declare if user has disabled..." into mnc-dev
Dianne Hackborn [Sat, 18 Jul 2015 01:04:14 +0000 (18:04 -0700)]
Fix issue #
22531747: Assist info should declare if user has disabled...
...context and/or screenshot
Added new API to find out what contextual data has been globally disabled.
Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).
Also added a new Activity.showAssist() API because... well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.
Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
Wale Ogunwale [Mon, 20 Jul 2015 19:11:06 +0000 (19:11 +0000)]
am
bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev
* commit '
bde85f741c2ccbb7d719cdf0a48a607b104c3943':
Fixed issue with background user window consuming touch events
Ricardo Garcia [Mon, 20 Jul 2015 18:47:21 +0000 (18:47 +0000)]
am
2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
* commit '
2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5':
Fix for MidiManager bug
Wale Ogunwale [Mon, 20 Jul 2015 18:45:58 +0000 (18:45 +0000)]
Merge "Fixed issue with background user window consuming touch events" into mnc-dev
Billy Lau [Mon, 20 Jul 2015 18:04:08 +0000 (18:04 +0000)]
am
072e04a7: Merge "Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
* commit '
072e04a7f1a167dc653b5bcca4876fecfdb4f6be':
Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
Jeff Sharkey [Mon, 20 Jul 2015 18:04:04 +0000 (18:04 +0000)]
am
71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev
* commit '
71780e79846d0ccc2aef2214041657410a8a14c2':
Better logging of MediaPlayer failure reason.
Jean-Michel Trivi [Mon, 20 Jul 2015 18:04:01 +0000 (18:04 +0000)]
am
698250fa: Merge "Media button intent should be send to current user only." into mnc-dev
* commit '
698250fae7d82d8020d2b9038b9e9d68c9489b04':
Media button intent should be send to current user only.
Ricardo Garcia [Mon, 20 Jul 2015 18:03:41 +0000 (18:03 +0000)]
Merge "Fix for MidiManager bug" into mnc-dev
Billy Lau [Mon, 20 Jul 2015 17:57:25 +0000 (17:57 +0000)]
Merge "Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 17:37:06 +0000 (17:37 +0000)]
Merge "Better logging of MediaPlayer failure reason." into mnc-dev
Billy Lau [Mon, 20 Jul 2015 16:34:09 +0000 (17:34 +0100)]
Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
through AppOps
Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.
Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
Christopher Tate [Mon, 20 Jul 2015 17:27:56 +0000 (17:27 +0000)]
am
6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev
* commit '
6afdad7e8863cb1fa3db5909e48269606fa76991':
Don't fall back to domain verification state when looking up app linkage state