OSDN Git Service
George Mount [Thu, 23 Jul 2015 19:47:48 +0000 (19:47 +0000)]
am
c2c3eacb: am
27fbd360: am
7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '
c2c3eacb4c41d5eff0a53be1f4e6dc94d8928300':
Null checks to prevent NPEs in Fragments transactions.
Jorim Jaggi [Thu, 23 Jul 2015 19:47:40 +0000 (19:47 +0000)]
am
fba92611: am
fcf9acb9: am
20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '
fba926118ed7d5465cb6e7b64d29153212f7cbee':
Add callback to voice interaction session for lockscreen shown
Adrian Roos [Thu, 23 Jul 2015 19:47:35 +0000 (19:47 +0000)]
am
9fb98375: am
b30f841c: resolved conflicts for merge of
c1244a29 to mnc-dr-dev
* commit '
9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1':
Touch, wake and unlock
George Mount [Thu, 23 Jul 2015 19:20:32 +0000 (19:20 +0000)]
am
27fbd360: am
7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '
27fbd360a8256cf6321da9ba29bab02b3d241aba':
Null checks to prevent NPEs in Fragments transactions.
Jorim Jaggi [Thu, 23 Jul 2015 19:20:27 +0000 (19:20 +0000)]
am
fcf9acb9: am
20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '
fcf9acb95a536f939a418529f642e60f51f5886a':
Add callback to voice interaction session for lockscreen shown
Adrian Roos [Thu, 23 Jul 2015 19:20:22 +0000 (19:20 +0000)]
am
b30f841c: resolved conflicts for merge of
c1244a29 to mnc-dr-dev
* commit '
b30f841cb44e132598939b0797dad41f6c0004a7':
Touch, wake and unlock
George Mount [Wed, 22 Jul 2015 20:23:02 +0000 (20:23 +0000)]
am
7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '
7c482463cbea39cdbf2c3c8f481d82711cf0475b':
Null checks to prevent NPEs in Fragments transactions.
Jorim Jaggi [Wed, 22 Jul 2015 20:22:56 +0000 (20:22 +0000)]
am
20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '
20df62345910ad390a3bb321990987757db0831d':
Add callback to voice interaction session for lockscreen shown
Adrian Roos [Wed, 22 Jul 2015 19:00:50 +0000 (12:00 -0700)]
resolved conflicts for merge of
c1244a29 to mnc-dr-dev
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
Geoff Mendal [Wed, 22 Jul 2015 16:25:34 +0000 (16:25 +0000)]
am
5c080bd2: (-s ours) am
c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
5c080bd2fb2d99724e1c0cec11fc1fe9d1cad597':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 16:09:47 +0000 (16:09 +0000)]
am
c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c41e3191654d1b1e9df641da6aa7a8bf4f64b975':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 15:56:29 +0000 (15:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 15:42:52 +0000 (10:42 -0500)]
Import translations. DO NOT MERGE
Change-Id: If03e28dba328619399e4f81a01283afbebd7d50d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Jul 2015 14:19:11 +0000 (14:19 +0000)]
am
8d5ed661: (-s ours) am
920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
8d5ed661f060e3d915f3f1f593f2f87ebd1285cc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 14:19:05 +0000 (14:19 +0000)]
am
a88427c3: (-s ours) am
e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a88427c34729368766593fc2a8864b5383e907cc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 14:19:00 +0000 (14:19 +0000)]
am
234bd0f4: (-s ours) am
b568f3fd: (-s ours) Import translations. DO NOT MERGE
* commit '
234bd0f46c9d75240906fa021b8c4975a34c9c10':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 14:03:58 +0000 (14:03 +0000)]
am
920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
920e8be69db7cd24a9c5566b95686a6b714447e9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 14:03:54 +0000 (14:03 +0000)]
am
e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
e573ee63b7a89b121ad36af883c2731d118f4794':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 14:03:50 +0000 (14:03 +0000)]
am
b568f3fd: (-s ours) Import translations. DO NOT MERGE
* commit '
b568f3fdc935c9a185b7cf8f462567a6be97b900':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 13:58:09 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 13:53:49 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: If222f66dff503d3b3f0349d76fd082a6780414d7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Jul 2015 13:51:43 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 13:50:26 +0000 (06:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I064668ffb91d718c0981ecd0f221e5f3b0d364d7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Jul 2015 13:49:42 +0000 (06:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d
Auto-generated-cl: translation import
George Mount [Tue, 21 Jul 2015 22:51:27 +0000 (22:51 +0000)]
Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
Jorim Jaggi [Tue, 21 Jul 2015 22:46:30 +0000 (22:46 +0000)]
Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
Jeff Sharkey [Tue, 21 Jul 2015 22:07:17 +0000 (22:07 +0000)]
am
934995ed: am
b020b0d9: am
cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev
* commit '
934995ede49b1b4bd8178cd44b1c0f338356982e':
Avoid NPE when no staged installs.
Jorim Jaggi [Tue, 21 Jul 2015 21:53:09 +0000 (21:53 +0000)]
Merge "Touch, wake and unlock" into mnc-dev
Jeff Sharkey [Tue, 21 Jul 2015 21:52:57 +0000 (21:52 +0000)]
am
b020b0d9: am
cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev
* commit '
b020b0d97d80f0ebb550ce58a5b36787cfcf6df8':
Avoid NPE when no staged installs.
Jeff Sharkey [Tue, 21 Jul 2015 21:36:56 +0000 (21:36 +0000)]
am
cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev
* commit '
cf051d1846c347413d8c907b42f3fce74795a815':
Avoid NPE when no staged installs.
John Reck [Tue, 21 Jul 2015 21:32:43 +0000 (21:32 +0000)]
am
1cd5afc1: am
9317d0b9: am
1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '
1cd5afc135b0aea3249219fcfb393d9bd9b53ec2':
Mark isInUse per-window
George Mount [Tue, 21 Jul 2015 21:30:24 +0000 (14:30 -0700)]
Null checks to prevent NPEs in Fragments transactions.
Bug
22631964
Change-Id: I20bc80bfb0ba5f1081d1c349b94db7c5475bcc51
Jeff Sharkey [Tue, 21 Jul 2015 21:23:56 +0000 (21:23 +0000)]
Merge "Avoid NPE when no staged installs." into mnc-dev
Fyodor Kupolov [Tue, 21 Jul 2015 21:19:50 +0000 (21:19 +0000)]
am
67cd2fc5: am
cf6500b9: am
55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '
67cd2fc5eb92dd1fb2fe6621d3d1d4dd33f199ce':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
John Reck [Tue, 21 Jul 2015 21:19:47 +0000 (21:19 +0000)]
am
9317d0b9: am
1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '
9317d0b9904573bdb0d815ec563dd263447f11db':
Mark isInUse per-window
Fyodor Kupolov [Tue, 21 Jul 2015 21:05:01 +0000 (21:05 +0000)]
am
cf6500b9: am
55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '
cf6500b9bae461107d5c0c58de511df907d19fb3':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
John Reck [Tue, 21 Jul 2015 21:04:45 +0000 (21:04 +0000)]
am
1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '
1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
Mark isInUse per-window
John Reck [Tue, 21 Jul 2015 20:50:27 +0000 (20:50 +0000)]
Merge "Mark isInUse per-window" into mnc-dev
Fyodor Kupolov [Tue, 21 Jul 2015 20:50:24 +0000 (20:50 +0000)]
am
55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '
55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Amith Yamasani [Tue, 21 Jul 2015 20:46:58 +0000 (20:46 +0000)]
am
b82c71a8: am
89d4131d: am
09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev
* commit '
b82c71a893cef1f18539ae48aafcca170809cc18':
Don't kill apps that are multi-user aware...
Alex Klyubin [Tue, 21 Jul 2015 20:33:42 +0000 (20:33 +0000)]
am
a3686e4b: am
a69e72c5: am
5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev
* commit '
a3686e4b388f174b2a952fee9e3d8e9b39eb47e4':
KM module may consume less input than provided by finish time.
Amith Yamasani [Tue, 21 Jul 2015 20:33:07 +0000 (20:33 +0000)]
am
89d4131d: am
09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev
* commit '
89d4131d75cc4c89e3fb36115be929837c9a3171':
Don't kill apps that are multi-user aware...
Fyodor Kupolov [Tue, 21 Jul 2015 20:32:25 +0000 (20:32 +0000)]
Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
Alex Klyubin [Tue, 21 Jul 2015 20:18:03 +0000 (20:18 +0000)]
am
a69e72c5: am
5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev
* commit '
a69e72c54786d2e3a585162b3bd71f325a1a6865':
KM module may consume less input than provided by finish time.
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...
Adam Lesinski [Tue, 21 Jul 2015 20:08:37 +0000 (20:08 +0000)]
am
ca34b184: am
a50f43e0: am
23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '
ca34b18481084b67fc690ee9c64301f785756dde':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
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.
Adam Lesinski [Tue, 21 Jul 2015 19:54:24 +0000 (19:54 +0000)]
am
a50f43e0: am
23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '
a50f43e0028ec174827e73d1e45666b8e694808f':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Christopher Tate [Tue, 21 Jul 2015 19:53:53 +0000 (19:53 +0000)]
am
22fac49a: am
6391a8d4: am
d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '
22fac49a7be4e51de31287156885aa76a568c979':
Add 'pm' operation to set a package's app-linking state
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
Svetoslav [Tue, 21 Jul 2015 19:44:27 +0000 (19:44 +0000)]
am
161314fa: am
358af143: am
81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
* commit '
161314fa5412068e8037f6841b5826865d038690':
Always create nodes for views backed by an adapter.
Christopher Tate [Tue, 21 Jul 2015 19:41:19 +0000 (19:41 +0000)]
am
6391a8d4: am
d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '
6391a8d44684f64d9b803f7994f26935a563a1ee':
Add 'pm' operation to set a package's app-linking state
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
Jorim Jaggi [Mon, 20 Jul 2015 22:51:40 +0000 (15:51 -0700)]
Add callback to voice interaction session for lockscreen shown
Bug:
22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
Svetoslav [Tue, 21 Jul 2015 19:30:37 +0000 (19:30 +0000)]
am
358af143: am
81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
* commit '
358af143454fdcda120e90840b6ca835bebc4120':
Always create nodes for views backed by an adapter.
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
Fyodor Kupolov [Tue, 21 Jul 2015 18:48:18 +0000 (11:48 -0700)]
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Bug:
21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
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
Todd Kennedy [Tue, 21 Jul 2015 18:52:13 +0000 (18:52 +0000)]
am
8e0ab997: am
548871f2: am
f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
* commit '
8e0ab9971cc33cc0d827cbbd901b488694012632':
Use RingtonePlayer to get ringtone title
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:37:15 +0000 (18:37 +0000)]
am
548871f2: am
f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
* commit '
548871f202c2c68e0197cc993073ca80a60f70da':
Use RingtonePlayer to get ringtone title
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:53:46 +0000 (17:53 +0000)]
am
6b04e5b8: am
894ffd10: am
673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
* commit '
6b04e5b803820d03c0ccf483851ed2432d39c49b':
UsbDeviceManager: add back support for USB overlays
John Reck [Tue, 21 Jul 2015 17:23:59 +0000 (10:23 -0700)]
Mark isInUse per-window
Bug:
22509159
Change-Id: I0ae0f1fa582ee38dcb9f24ca20f0b4d0c57ccb32
Nick Kralevich [Tue, 21 Jul 2015 17:38:50 +0000 (17:38 +0000)]
am
894ffd10: am
673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
* commit '
894ffd102d90a7c794e5c522818f163b92baa55d':
UsbDeviceManager: add back support for USB overlays
Raph Levien [Tue, 21 Jul 2015 17:31:06 +0000 (17:31 +0000)]
am
fa8570bc: am
7026617e: am
1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
* commit '
fa8570bcd205859b9068105b389a80de32f7f85d':
Respect style boundaries when measuring text
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
Raph Levien [Tue, 21 Jul 2015 17:17:49 +0000 (17:17 +0000)]
am
7026617e: am
1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
* commit '
7026617e74cc1753ae7c1846e005dc7b3286170d':
Respect style boundaries when measuring text
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 16:16:59 +0000 (16:16 +0000)]
am
224dfca6: am
c273c178: am
66e66831: Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
* commit '
224dfca641fb02b4a4a47deeeda9d03036c613fa':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 16:04:20 +0000 (16:04 +0000)]
am
c273c178: am
66e66831: Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
* commit '
c273c178d70eda9858714d59118b05da7ffb5313':
Render to measured size when using expand mode
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 15:07:09 +0000 (15:07 +0000)]
am
18c87a1e: am
7dcad6a5: am
e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev
* commit '
18c87a1eb8c7f1e11fe48daa61ec37f6ec29691b':
Don't duplicate recent tasks of the same affinity.
Wale Ogunwale [Tue, 21 Jul 2015 14:52:05 +0000 (14:52 +0000)]
am
7dcad6a5: am
e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev
* commit '
7dcad6a5d426e1a243e36cbd084c60bc8038c56b':
Don't duplicate recent tasks of the same affinity.
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
Jae Seo [Tue, 21 Jul 2015 00:40:37 +0000 (00:40 +0000)]
am
6ff64bc3: am
6564934d: am
b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
* commit '
6ff64bc34daf55874f5372d0cda444f67c892bdf':
TIF: Get or create the user state when failed to find existing one
Terry Heo [Tue, 21 Jul 2015 00:40:31 +0000 (00:40 +0000)]
am
00869af8: am
aaf67d95: am
e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
* commit '
00869af85d0df92b00155ecf84311eccbd1647cf':
TIF: Use copied track list for onTracksChanged() callback
Jae Seo [Tue, 21 Jul 2015 00:28:20 +0000 (00:28 +0000)]
am
6564934d: am
b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
* commit '
6564934d1a3f1020184c48bdddbe91321652a0b2':
TIF: Get or create the user state when failed to find existing one
Terry Heo [Tue, 21 Jul 2015 00:28:16 +0000 (00:28 +0000)]
am
aaf67d95: am
e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
* commit '
aaf67d952711e9587df143e017618fc488c32077':
TIF: Use copied track list for onTracksChanged() callback
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
Dongwon Kang [Tue, 21 Jul 2015 00:21:50 +0000 (00:21 +0000)]
am
e64dfb47: am
14bdaa7f: am
6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
* commit '
e64dfb47738c6b5fd3f7fabe1a1bce0c0acc07be':
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
Jorim Jaggi [Tue, 21 Jul 2015 00:21:44 +0000 (00:21 +0000)]
am
4cb9ccc7: am
c0469f99: am
55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
* commit '
4cb9ccc73282484f9330ecf95d5d9b7bff07040b':
Test app to emit all AccessibilityEvents to logcat.
Jorim Jaggi [Tue, 21 Jul 2015 00:21:37 +0000 (00:21 +0000)]
am
f2ae250e: am
7cc56bb4: am
1f98c62f: Fix unnecessary layer creation for appear animation
* commit '
f2ae250e7e7410918589b2c9eb0d6101c90f4128':
Fix unnecessary layer creation for appear animation
Miao Wang [Tue, 21 Jul 2015 00:21:31 +0000 (00:21 +0000)]
am
c1f197ca: am
6005f9e5: am
15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
* commit '
c1f197ca7db5845c31e36648b3974b844bb55067':
[RenderScript] Add docs advising users about dstAtop bug.