git.osdn.net Git - android-x86/frameworks-base.git/log

Android Build Merger (Role) [Thu, 21 Apr 2016 00:58:24 +0000 (00:58 +0000)]

Merge "Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am: c708cf6340 am: 2d533c4cd1" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 00:58:13 +0000 (00:58 +0000)]

Merge "Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd am: 7116fb05e8" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 00:57:37 +0000 (00:57 +0000)]

Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am: c708cf6340
am: 2d533c4cd1

* commit '2d533c4cd11928382182e5637cb898d9ee6d6be6':

Change-Id: Ic354627ceb6f9676f6656111ab8b8ec9332fd91a

commit | commitdiff | tree

Dianne Hackborn [Thu, 21 Apr 2016 00:57:32 +0000 (00:57 +0000)]

Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd
am: 7116fb05e8

* commit '7116fb05e8cde66d420351df1a5a78ce0dfc3b62':

Change-Id: I01aa5d583f22d8ef9d41419b199665e9c3b17905

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 00:55:53 +0000 (00:55 +0000)]

Merge "Merge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc am: f70c55db09" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 00:55:44 +0000 (00:55 +0000)]

Merge "Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am: c708cf6340 am: 2d533c4cd1" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 00:55:30 +0000 (00:55 +0000)]

Merge "Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd am: 7116fb05e8" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Amith Yamasani [Thu, 21 Apr 2016 00:54:49 +0000 (00:54 +0000)]

Merge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc
am: f70c55db09

* commit 'f70c55db095522cf94dc6a982a39497add624f92':
Throw better exception when startVoiceActivity fails

Change-Id: I57ace84c67023c237a5dd5d19009c558069451c7

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 00:54:45 +0000 (00:54 +0000)]

Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am: c708cf6340
am: 2d533c4cd1

* commit '2d533c4cd11928382182e5637cb898d9ee6d6be6':
BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I23a209d0c18c78aaa0fdea25f7acc86be87cf94c

commit | commitdiff | tree

Amith Yamasani [Thu, 21 Apr 2016 00:54:41 +0000 (00:54 +0000)]

Merge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc
am: bc25c87c57

* commit 'bc25c87c57009fac7f03fab5cd502e856c4e37bb':
Throw better exception when startVoiceActivity fails

Change-Id: Ib167620ed22fe57d17e8dac63a64de5f38dac4db

commit | commitdiff | tree

Dianne Hackborn [Thu, 21 Apr 2016 00:54:40 +0000 (00:54 +0000)]

Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd
am: 7116fb05e8

* commit '7116fb05e8cde66d420351df1a5a78ce0dfc3b62':
Fix logspam by JobInfo

Change-Id: I0f5580791fa6b4b87e4a5201af3e4a8d26c40275

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 00:54:39 +0000 (00:54 +0000)]

Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am: c708cf6340
am: 051b810da6

* commit '051b810da60829c9dc0b4d50cf86c3631a0f8611':
BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I35970a3c77be95586ae0d2e8a8d959bf491fd106

commit | commitdiff | tree

Dianne Hackborn [Thu, 21 Apr 2016 00:54:36 +0000 (00:54 +0000)]

Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd
am: f153182db7

* commit 'f153182db785ec45591d0a46815ab5463e8b143d':
Fix logspam by JobInfo

Change-Id: I2d9f2218225a79b176f7093d2f8d1e9cb16c26a9

commit | commitdiff | tree

Amith Yamasani [Thu, 21 Apr 2016 00:50:10 +0000 (00:50 +0000)]

Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
am: 2be4c463bc

* commit '2be4c463bc6411cf6fb9e2a4be0cbb90c485d0de':
Throw better exception when startVoiceActivity fails

Change-Id: Ie8dfd6ed1f366e24418f352c810281ca687c70fb

commit | commitdiff | tree

Amith Yamasani [Thu, 21 Apr 2016 00:50:08 +0000 (00:50 +0000)]

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 00:50:07 +0000 (00:50 +0000)]

Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
am: c708cf6340

* commit 'c708cf6340e623202e562992e6ef4062ace84cab':
BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I6ba6f66ebc9d4ffebc8e6f5444957d0a345da4fd

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 00:50:06 +0000 (00:50 +0000)]

commit | commitdiff | tree

Shreyas Basarge [Thu, 21 Apr 2016 00:50:04 +0000 (00:50 +0000)]

Merge "Fix logspam by JobInfo" into nyc-dev
am: bb9dd3c9fd

* commit 'bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
Fix logspam by JobInfo

Change-Id: Icdb25bb608e89c280ee756d7dd4fadd03b25da15

commit | commitdiff | tree

Shreyas Basarge [Thu, 21 Apr 2016 00:50:04 +0000 (00:50 +0000)]

Merge "Fix logspam by JobInfo" into nyc-dev
am: bb9dd3c9fd

* commit 'bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
Fix logspam by JobInfo

Change-Id: I58ec5ed68dad8df8c5f73c3e313181c36f0d27dd

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Apr 2016 00:46:30 +0000 (00:46 +0000)]

Merge "Throw better exception when startVoiceActivity fails" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 00:43:53 +0000 (00:43 +0000)]

Merge "Merge "Increase the max binder thread pool size for system_server." into nyc-dev am: 150553756f am: f8825f5f7c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Tim Murray [Thu, 21 Apr 2016 00:43:26 +0000 (00:43 +0000)]

Merge "Increase the max binder thread pool size for system_server." into nyc-dev am: 150553756f
am: f8825f5f7c

* commit 'f8825f5f7c43d9576f06e728250264c691f38422':

Change-Id: I9f0f4adc2922443127d52c98617e20179f81296b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 00:41:48 +0000 (00:41 +0000)]

Merge "Merge "Increase the max binder thread pool size for system_server." into nyc-dev am: 150553756f am: f8825f5f7c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Tim Murray [Thu, 21 Apr 2016 00:41:14 +0000 (00:41 +0000)]

Merge "Increase the max binder thread pool size for system_server." into nyc-dev am: 150553756f
am: f8825f5f7c

* commit 'f8825f5f7c43d9576f06e728250264c691f38422':
Increase the max binder thread pool size for system_server.

Change-Id: Ied4874755c5d8a0c3e81ef623118a0d3549e0114

commit | commitdiff | tree

Tim Murray [Thu, 21 Apr 2016 00:41:13 +0000 (00:41 +0000)]

Merge "Increase the max binder thread pool size for system_server." into nyc-dev am: 150553756f
am: b16a93f955

* commit 'b16a93f9552a0945b91398a81e6ac794123423f6':
Increase the max binder thread pool size for system_server.

Change-Id: I3266b06a6ff39147c1d04af3fe538dd49cfe82bf

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 00:39:57 +0000 (00:39 +0000)]

Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 00:39:51 +0000 (00:39 +0000)]

Merge "Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4 am: 458216854a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Dianne Hackborn [Thu, 21 Apr 2016 00:39:41 +0000 (00:39 +0000)]

Merge "Fix logspam by JobInfo" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 00:39:37 +0000 (00:39 +0000)]

Merge "Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev am: 206748d10e am: 6d5dfa3977" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:39:08 +0000 (00:39 +0000)]

Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4
am: 458216854a

* commit '458216854aee6f7d64034a9d6f3049fe2b43689f':
Prevent printing from finishing activity.

Change-Id: I1b153cad434bcde641660c18c040afc3f7badac5

commit | commitdiff | tree

Tim Murray [Thu, 21 Apr 2016 00:39:06 +0000 (00:39 +0000)]

Merge "Increase the max binder thread pool size for system_server." into nyc-dev
am: 150553756f

* commit '150553756f89a51cc70b24cd9dbab4bdfba0fc59':
Increase the max binder thread pool size for system_server.

Change-Id: I8312e28eac4b6b00b94af85d0e887448ec849652

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:39:06 +0000 (00:39 +0000)]

Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev am: 206748d10e
am: 6d5dfa3977

* commit '6d5dfa39777524b49e1af7bb6552eb11ca5383e4':
A11y: Fix battery icon and clock descriptions

Change-Id: I7f17a4371213e78b7acbc22cb52f93e452e4bec2

commit | commitdiff | tree

Tim Murray [Thu, 21 Apr 2016 00:39:02 +0000 (00:39 +0000)]

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:37:22 +0000 (00:37 +0000)]

Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4
am: a9c65ffb00

* commit 'a9c65ffb003c8c00667f9ec0d3d7efd28c334b6c':
Prevent printing from finishing activity.

Change-Id: I8f3263acd7323f6cb7804c75b2cd877768963ada

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:37:19 +0000 (00:37 +0000)]

Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev am: 206748d10e
am: 6d3a23d148

* commit '6d3a23d1487b54f39bcca3b79e04aa6819735d2e':
A11y: Fix battery icon and clock descriptions

Change-Id: Ia8555d5d5f54461dc4f3895c6ba9c3e33a4ecf5a

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:37:15 +0000 (00:37 +0000)]

Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev am: 50a871857d
am: 13e68d12f3

* commit '13e68d12f38f51c5bfdfd0ca534d0831ffaba909':

Change-Id: I3e7744ac7a609913e84afe67bc554d5eaec08861

commit | commitdiff | tree

Jorim Jaggi [Thu, 21 Apr 2016 00:37:09 +0000 (00:37 +0000)]

Merge "Disallow changing stacks if top activity" into nyc-dev am: 1fa356289e
am: d622254af0

* commit 'd622254af08f0c80eaf6af5dbb3aaf138ae5740c':

Change-Id: Ie90be75664a5ff9c677133639ddb82a44cfb74cb

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:34:36 +0000 (00:34 +0000)]

Merge "Prevent printing from finishing activity." into nyc-dev
am: 41304f47f4

* commit '41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
Prevent printing from finishing activity.

Change-Id: Ia3de45edab34f91a0da0f0474c8e870f3f132e45

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:34:33 +0000 (00:34 +0000)]

Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev
am: 206748d10e

* commit '206748d10e5f3b42e198af6a2e0801fb47ec3c01':
A11y: Fix battery icon and clock descriptions

Change-Id: I92f4bad9e6224fdafd7a48e3ceec3452c7150e03

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:34:33 +0000 (00:34 +0000)]

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:34:32 +0000 (00:34 +0000)]

commit | commitdiff | tree

Tim Murray [Thu, 21 Apr 2016 00:32:45 +0000 (00:32 +0000)]

Merge "Increase the max binder thread pool size for system_server." into nyc-dev

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:32:05 +0000 (00:32 +0000)]

Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev am: 50a871857d
am: a70594be57

* commit 'a70594be57fb4cdd636a63d642e09d13a4fa2158':
Print API for N: Fix docs and change interfaces as requested.

Change-Id: Iff2290944bc7f23ab995eff1ebb381b3ffa5e996

commit | commitdiff | tree

Jorim Jaggi [Thu, 21 Apr 2016 00:32:02 +0000 (00:32 +0000)]

Merge "Disallow changing stacks if top activity" into nyc-dev am: 1fa356289e
am: a44352598e

* commit 'a44352598e848bb009288626a5e813297ead3bec':
Disallow changing stacks if top activity

Change-Id: Ia8adf144b33853d208252e5ad3e92b4a10adb2d7

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:31:41 +0000 (00:31 +0000)]

Merge "Prevent printing from finishing activity." into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Apr 2016 00:25:14 +0000 (00:25 +0000)]

Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev

commit | commitdiff | tree

Vladislav Kaznacheev [Thu, 21 Apr 2016 00:23:58 +0000 (00:23 +0000)]

Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 28609360cf
am: bd048c598d

* commit 'bd048c598dbf84552f579a05624ae844ff203ed5':

Change-Id: Ie926f080e5697e4801a5507e4c2e924a29d5da35

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 00:23:54 +0000 (00:23 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev am: abadeba99a
am: d762b90312

* commit 'd762b903127d11768f5c47350966105c658d22e0':

Change-Id: I65e837f14aee6eb238834ef7d50886e7f5bc2449

commit | commitdiff | tree

Suprabh Shukla [Thu, 21 Apr 2016 00:23:49 +0000 (00:23 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev am: 6c0ead993e
am: 52746e79f8

* commit '52746e79f888721354941ae0e37451e6e9b9162d':

Change-Id: I37ea2eb58efd50593018f1161f488b68f525eebd

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 21 Apr 2016 00:23:44 +0000 (00:23 +0000)]

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev am: 5856779c3a
am: a6587338ea

* commit 'a6587338ea17c17ca94da9b8584813bf8e7f858c':

Change-Id: I3cbbadfc867e792710d506e2a291c75e8556a1c7

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:23:38 +0000 (00:23 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev am: 75fe7d5d79
am: f4c21179ac

* commit 'f4c21179ac2fa0da375ba7c7dad6a466d47a6277':

Change-Id: I9e45dec7a37d201897b0448c73246808bccbb420

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:23:34 +0000 (00:23 +0000)]

Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
am: 50a871857d

* commit '50a871857d4a6c6f8d6ce8b3621414e60a32eaf6':
Print API for N: Fix docs and change interfaces as requested.

Change-Id: Id9b2b228001802d6b5325e6b01d318e265541441

commit | commitdiff | tree

Felipe Leme [Thu, 21 Apr 2016 00:23:31 +0000 (00:23 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev am: 3053c3f2a9
am: 13e3b2bc78

* commit '13e3b2bc7899899674551d3a1cdc926ba905e926':

Change-Id: I5b4eecf49e431eac9ed38d6d2b68e1bad9fb39b6

commit | commitdiff | tree

Jorim Jaggi [Thu, 21 Apr 2016 00:23:30 +0000 (00:23 +0000)]

Merge "Disallow changing stacks if top activity" into nyc-dev
am: 1fa356289e

* commit '1fa356289e50d9a48d84afe831b230b087870e76':
Disallow changing stacks if top activity

Change-Id: I9ae3ec2054b835724fead6ec8a940b228018ffba

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:23:28 +0000 (00:23 +0000)]

commit | commitdiff | tree

Jorim Jaggi [Thu, 21 Apr 2016 00:23:25 +0000 (00:23 +0000)]

commit | commitdiff | tree

Vladislav Kaznacheev [Thu, 21 Apr 2016 00:18:20 +0000 (00:18 +0000)]

Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
am: 28609360cf

* commit '28609360cfe25446ab5b0ba165af363378b3d805':
Add JavaDoc for View.updateDragShadow

Change-Id: I2d5488d78f4095cdfa3558dc0a4e3a785c420648

commit | commitdiff | tree

Robert Carr [Thu, 21 Apr 2016 00:18:13 +0000 (00:18 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
am: abadeba99a

* commit 'abadeba99afbb1d80a38b396407822c96c7e3706':
Prevent recents from closing while moving PiP to fullscreen.

Change-Id: I672c73f0a60fd37498e647edec42c8be3e10780e

commit | commitdiff | tree

Suprabh Shukla [Thu, 21 Apr 2016 00:18:04 +0000 (00:18 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev
am: 6c0ead993e

* commit '6c0ead993e48f6e260972171b1187ef77b6094fb':
Removing disk access from startActivity thread

Change-Id: I0115c5a8c9f7c1550f09ac8b9c1025f83e09bace

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 21 Apr 2016 00:17:55 +0000 (00:17 +0000)]

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
am: 5856779c3a

* commit '5856779c3a3e00e256cdf5cb571a85975d781cf4':
Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I7905d6ef70ba031736fcc2cea9f1ffdabe09851e

commit | commitdiff | tree

Philip P. Moltmann [Thu, 21 Apr 2016 00:17:46 +0000 (00:17 +0000)]

Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:17:46 +0000 (00:17 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
am: 75fe7d5d79

* commit '75fe7d5d791d8372af9d2e11a50287e6119a9780':
Fix inline reply clobbering when narrowly missing send button

Change-Id: I4edee46cb06a4c6f7beadab5e8a56cdc902fdbec

commit | commitdiff | tree

Vladislav Kaznacheev [Thu, 21 Apr 2016 00:17:45 +0000 (00:17 +0000)]

Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 2860936
am: 1a5cc60b39

* commit '1a5cc60b3968d54b9c7bf4e6883b3b4ca55821ca':
Add JavaDoc for View.updateDragShadow

Change-Id: I07bfcff42ea12ae0260c850012d936121b3d3ea6

commit | commitdiff | tree

Felipe Leme [Thu, 21 Apr 2016 00:17:40 +0000 (00:17 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am: 3053c3f2a9

* commit '3053c3f2a94b24ceeed9c46cb84045c285d3523b':
Set BugreportProgressService to run on foreground.

Change-Id: I6ff60394218bceac0fdd4eed4839f5819f532180

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 00:17:40 +0000 (00:17 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev am: abadeba
am: 63278b4ebe

* commit '63278b4ebe171cd70b9c91e74819c59ca130bf02':
Prevent recents from closing while moving PiP to fullscreen.

Change-Id: Ife12f301828d84f76c8594a1e852f3886a533a78

commit | commitdiff | tree

Suprabh Shukla [Thu, 21 Apr 2016 00:17:35 +0000 (00:17 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev am: 6c0ead9
am: 2537c274e1

* commit '2537c274e10b9429056e2deaf1d1d40ae500ed4b':
Removing disk access from startActivity thread

Change-Id: Ie5fca445c5e2f507a4a5bcf99fd25898cd5d2e23

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 21 Apr 2016 00:17:30 +0000 (00:17 +0000)]

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev am: 5856779
am: 896a1a42f7

* commit '896a1a42f708eee4c70e0e99f47bcb304311e3c0':
Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I2375878fba957134228ab0c45bf396e69c820320

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:17:24 +0000 (00:17 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev am: 75fe7d5
am: e93ff33338

* commit 'e93ff3333868d297966f73dd6c74b130c8c1b2cf':
Fix inline reply clobbering when narrowly missing send button

Change-Id: Ic5e8257d05487a91828cf2acbdfcf9637e24c40e

commit | commitdiff | tree

Felipe Leme [Thu, 21 Apr 2016 00:17:17 +0000 (00:17 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev am: 3053c3f
am: 10dcbecd8c

* commit '10dcbecd8c14f82f9da5787afdf9663c3867c82d':
Set BugreportProgressService to run on foreground.

Change-Id: Iabd7b03e8af7da7fa7aaf25b6c5a2e25586d48b3

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Apr 2016 00:11:49 +0000 (00:11 +0000)]

Merge "Disallow changing stacks if top activity" into nyc-dev

commit | commitdiff | tree

Vladislav Kaznacheev [Thu, 21 Apr 2016 00:11:28 +0000 (00:11 +0000)]

Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
am: 2860936

* commit '28609360cfe25446ab5b0ba165af363378b3d805':
Add JavaDoc for View.updateDragShadow

Change-Id: I9aa23cafbeedf21e2cbca4e84adc0b424f7cfec0

commit | commitdiff | tree

Robert Carr [Thu, 21 Apr 2016 00:11:27 +0000 (00:11 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
am: abadeba

* commit 'abadeba99afbb1d80a38b396407822c96c7e3706':
Prevent recents from closing while moving PiP to fullscreen.

Change-Id: I97fa47524a1c78aa637fee4d6a086dec966698e7

commit | commitdiff | tree

Suprabh Shukla [Thu, 21 Apr 2016 00:03:13 +0000 (00:03 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev
am: 6c0ead9

* commit '6c0ead993e48f6e260972171b1187ef77b6094fb':
Removing disk access from startActivity thread

Change-Id: I7f62940ac1b51109f8804cc92c56dcd2b755340f

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 21 Apr 2016 00:03:11 +0000 (00:03 +0000)]

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
am: 5856779

* commit '5856779c3a3e00e256cdf5cb571a85975d781cf4':
Camera2: Ignore exception on double-completed capture sequences.

Change-Id: Ie22c0bbdc83cba529bf521ebaef3349a5e22b976

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Apr 2016 00:02:06 +0000 (00:02 +0000)]

Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 00:00:06 +0000 (00:00 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Apr 2016 23:58:01 +0000 (23:58 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev

commit | commitdiff | tree

Eino-Ville Talvala [Wed, 20 Apr 2016 23:55:09 +0000 (23:55 +0000)]

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev

commit | commitdiff | tree

Henrik Baard [Wed, 20 Apr 2016 23:48:40 +0000 (23:48 +0000)]

Merge "Doze settings example not matching real keys" am: 570a13f am: 790699d
am: 2988b8f6

* commit '2988b8f641e9d9602cc6ebdd1fad388a57a5f6ec':
Doze settings example not matching real keys

Change-Id: Ia83d408d2aa7d45d244e1c46f0852eed1f529670

commit | commitdiff | tree

Shreyas Basarge [Wed, 20 Apr 2016 23:44:58 +0000 (00:44 +0100)]

Fix logspam by JobInfo

Print interval clamp message
only for periodic jobs having
period/flex less than the minimum value.

Bug: 28296128
Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93

commit | commitdiff | tree

Adrian Roos [Wed, 20 Apr 2016 23:44:54 +0000 (23:44 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
am: 75fe7d5

* commit '75fe7d5d791d8372af9d2e11a50287e6119a9780':
Fix inline reply clobbering when narrowly missing send button

Change-Id: I61f9303383937030750edd95eee11862b59e8447

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 23:42:01 +0000 (23:42 +0000)]

Merge "Doze settings example not matching real keys" am: 570a13f
am: 790699d

* commit '790699db64ee18d143cd9813e91044fcc5a26713':
Doze settings example not matching real keys

Change-Id: I5c1a0757f5db2ba3ca2fcf37e77641ac820fbe6f

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Apr 2016 23:39:50 +0000 (23:39 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev

commit | commitdiff | tree

Felipe Leme [Wed, 20 Apr 2016 23:33:28 +0000 (23:33 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am: 3053c3f

* commit '3053c3f2a94b24ceeed9c46cb84045c285d3523b':
Set BugreportProgressService to run on foreground.

Change-Id: Ib5b92dfcaf3dca5710abc19f261fed8017fcae1f

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 23:30:36 +0000 (23:30 +0000)]

Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0
am: 4892e3e

* commit '4892e3e1d96e3dad0f40a76742200d1cfc5f1b5e':

Change-Id: Ia6ae5b19122ecaf8bd4c20d4b7bfdfd2c1c59a4a

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 23:30:33 +0000 (23:30 +0000)]

Merge "Added defensive code to prevent system crash" into nyc-dev am: a381455
am: 7742264

* commit '77422649f1cd565d6238a02da260dd6e087899e5':

Change-Id: I22ea4e5863b0684cf3198afea1a6408e85ef8df8

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 23:30:30 +0000 (23:30 +0000)]

Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev am: e1b5171
am: 4eb3607

* commit '4eb3607eb80c93ed4016a7e4af8d1c129b3af186':

Change-Id: I7db306588c908077948fcf95b3371496eecbb343

commit | commitdiff | tree

Chris Tate [Wed, 20 Apr 2016 23:30:26 +0000 (23:30 +0000)]

Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev am: 665189f
am: a767ce6

* commit 'a767ce6a8638a076af2a87d0e7a150f0bb8ea65a':

Change-Id: I7ed70c86aeefef037dc591598276f488c158bb0e

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 23:30:21 +0000 (23:30 +0000)]

resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c am: b965ced -s ours am: 129c01a
am: e3e398f

* commit 'e3e398f1964fa4a67d3ffad43110a78093f506d6':

Change-Id: Ibd25d682faea1fef51d33cfa871b64f0b6b0414f

commit | commitdiff | tree

Rob Carr [Wed, 20 Apr 2016 23:30:15 +0000 (23:30 +0000)]

Merge "Do not prematurely update position while bounds animating." into nyc-dev am: 5a6c58e
am: 55db403

* commit '55db403c76ca2fb706352dcc7a9d861170e6d400':

Change-Id: I0b778a4c4bb7fa9525ccf41f900f8a7bd421f070

commit | commitdiff | tree

Jim Miller [Wed, 20 Apr 2016 23:30:08 +0000 (23:30 +0000)]

Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 54c4374
am: 3978135

* commit '3978135639e56889405ed949f94faa224c57246c':

Change-Id: Ifa013b5139b29e44ed896015f45464678cd3b146

commit | commitdiff | tree

Phil Burk [Wed, 20 Apr 2016 23:30:00 +0000 (23:30 +0000)]

Merge "MidiDevice: do not open ports on closed device" into nyc-dev am: 2faac0d
am: a0d18fe

* commit 'a0d18fe9341ac0239b0be035f2a1deaf2661bf86':

Change-Id: I540b2734c12cb0cfc03ce7818ca9eb0dfc9e70ba

commit | commitdiff | tree

Fyodor Kupolov [Wed, 20 Apr 2016 23:29:52 +0000 (23:29 +0000)]

Merge "Test coverage for new FBE functionality" into nyc-dev am: 366a457
am: e2cd249

* commit 'e2cd2496a9c6f4ea4d846083098feaf1d64f4dea':

Change-Id: Iab2687ff5c97ab5d2294bf6ba7948a255d70e4b0

commit | commitdiff | tree

Ruchi Kandoi [Wed, 20 Apr 2016 23:29:44 +0000 (23:29 +0000)]

Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev am: 0fea8ad
am: 9043031

* commit '904303190b44efc862af2f86e23826baa37409ee':

Change-Id: Ieadc185f59f41530c8b6fb7bdd841636445894cb

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Apr 2016 23:23:10 +0000 (23:23 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 23:00:21 +0000 (23:00 +0000)]

Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0
am: 40c6118

* commit '40c611853eedd9d7ebf41a778e278751fbc82cb8':
ResourcesManager: Throw exception if failed to load asset path

Change-Id: I609d2b2a22ecb274c21a413edabd7ac4b28fbc94

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 22:56:11 +0000 (22:56 +0000)]

Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
am: 1362ae0

* commit '1362ae062a196c8450a0b649dd0c5af66d1f05a1':
ResourcesManager: Throw exception if failed to load asset path

Change-Id: I59a5eeb3502d12382e30faceb769eaef719b65d1

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 22:56:11 +0000 (22:56 +0000)]

commit | commitdiff | tree

Adrian Roos [Wed, 20 Apr 2016 22:51:42 +0000 (15:51 -0700)]

A11y: Fix battery icon and clock descriptions

Now announces charging state on the battery icon
and AM/PM on the clock.

Change-Id: Ib8d249e60b555834e5e224287ea332178ce7c165
Fixes: 27552350

commit | commitdiff | tree

Henrik Baard [Wed, 20 Apr 2016 22:51:47 +0000 (22:51 +0000)]

Merge "Doze settings example not matching real keys"
am: 570a13f

* commit '570a13f0cb233b4a216243025a9fed3df3c72849':
Doze settings example not matching real keys

Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f