OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12
Phil Weaver [Thu, 21 Apr 2016 01:45:28 +0000 (01:45 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev am: 4b88bddb12
am: 09587468a5

* commit '09587468a5b606f5b4ec34040cfa21da19e364c8':
  Fix a11y key event handling from multiple devices.

Change-Id: Ied69b63dcede325c234752e173da464511ee2c37

8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev
Phil Weaver [Thu, 21 Apr 2016 01:42:49 +0000 (01:42 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev
am: 4b88bddb12

* commit '4b88bddb12a62ec2d791d45e5b995aab87666a7b':
  Fix a11y key event handling from multiple devices.

Change-Id: Ie054d5be82eed912696af2775e382e67e3025bf0

8 years agoMerge "Fix a11y key event handling from multiple devices." into nyc-dev
Phil Weaver [Thu, 21 Apr 2016 01:38:47 +0000 (01:38 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev

8 years agoMerge "Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d am: a7c10049af...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:29:10 +0000 (01:29 +0000)]
Merge "Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d am: a7c10049af" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:29:00 +0000 (01:29 +0000)]
Merge "Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762 am: 8521feb37d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e am: d361f2360f...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:28:47 +0000 (01:28 +0000)]
Merge "Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e am: d361f2360f" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
Jorim Jaggi [Thu, 21 Apr 2016 01:27:55 +0000 (01:27 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
am: a7c10049af

* commit 'a7c10049af733d464637b96a79e86b2d3713bae1':

Change-Id: Ied385e3ca4c024d7efdd3f142021ff431b29c662

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
Chris Tate [Thu, 21 Apr 2016 01:27:51 +0000 (01:27 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
am: 8521feb37d

* commit '8521feb37d3ca36407aea5e26b426d414c2ddddb':

Change-Id: I7ec87c19864ae9f11c1244af3bd9f83ab27446de

8 years agoMerge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
Jaewan Kim [Thu, 21 Apr 2016 01:27:46 +0000 (01:27 +0000)]
Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
am: d361f2360f

* commit 'd361f2360f6ac682ebc7395b7d63bc334a3b629f':

Change-Id: Id325c213316430c52d3a5ff6e646dd88eb367333

8 years agoMerge "Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d am: a7c10049af...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:26:14 +0000 (01:26 +0000)]
Merge "Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d am: a7c10049af" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:26:03 +0000 (01:26 +0000)]
Merge "Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762 am: 8521feb37d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e am: d361f2360f...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:25:51 +0000 (01:25 +0000)]
Merge "Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e am: d361f2360f" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
Jorim Jaggi [Thu, 21 Apr 2016 01:24:59 +0000 (01:24 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
am: a7c10049af

* commit 'a7c10049af733d464637b96a79e86b2d3713bae1':
  Fix IME adjust in SysUI

Change-Id: I93885b7efad1bd93ec844056ab57e4a211108edf

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
Chris Tate [Thu, 21 Apr 2016 01:24:55 +0000 (01:24 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
am: 8521feb37d

* commit '8521feb37d3ca36407aea5e26b426d414c2ddddb':
  Only invoke k/v helpers during k/v operations

Change-Id: I217ddf96f43641adc653ab4368bd5749604468e3

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
Jorim Jaggi [Thu, 21 Apr 2016 01:24:53 +0000 (01:24 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev am: 54d056ed6d
am: 8364ebd457

* commit '8364ebd4578b918968650edcc5276f26922b7d4f':
  Fix IME adjust in SysUI

Change-Id: Ibc89830dfd4396439e0627de971868fd7bd64863

8 years agoMerge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
Jaewan Kim [Thu, 21 Apr 2016 01:24:51 +0000 (01:24 +0000)]
Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
am: d361f2360f

* commit 'd361f2360f6ac682ebc7395b7d63bc334a3b629f':
  PIP: Support accessibility

Change-Id: I687a54985db8855d4f327795d39fa2d2f7e7bf19

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
Chris Tate [Thu, 21 Apr 2016 01:24:50 +0000 (01:24 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev am: 157ae98762
am: 11c07421da

* commit '11c07421da3e0b419221e2833cac75e9eaec9f48':
  Only invoke k/v helpers during k/v operations

Change-Id: I3508971fa36025630b33c5964f6c4c8f13f0acc8

8 years agoMerge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
Jaewan Kim [Thu, 21 Apr 2016 01:24:47 +0000 (01:24 +0000)]
Merge "PIP: Support accessibility" into nyc-dev am: 34a96e704e
am: 504c2ada65

* commit '504c2ada6534b44398870b8018ac558e26899cf5':
  PIP: Support accessibility

Change-Id: I098c0b49dc09b2e47845908ff5bd3eff46883ab7

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev
Jorim Jaggi [Thu, 21 Apr 2016 01:20:20 +0000 (01:20 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev
am: 54d056ed6d

* commit '54d056ed6d75083ce166eb003fb93efc53cefea5':
  Fix IME adjust in SysUI

Change-Id: I5e7634ff459865622cb5ea819d4358827796e8ae

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev
Christopher Tate [Thu, 21 Apr 2016 01:20:17 +0000 (01:20 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev
am: 157ae98762

* commit '157ae987627ce93939c40dc6f1f3913b243973ae':
  Only invoke k/v helpers during k/v operations

Change-Id: I802010298db254ffb659b68ec4ac2ac569741a5b

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev
Jorim Jaggi [Thu, 21 Apr 2016 01:20:14 +0000 (01:20 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev
am: 54d056ed6d

* commit '54d056ed6d75083ce166eb003fb93efc53cefea5':
  Fix IME adjust in SysUI

Change-Id: I91ed0f07e9f39bbda4c88f1397707e29bfd75101

8 years agoMerge "PIP: Support accessibility" into nyc-dev
Jaewan Kim [Thu, 21 Apr 2016 01:20:14 +0000 (01:20 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
am: 34a96e704e

* commit '34a96e704e6bc12cc06d186ad7a344706a8afb5b':
  PIP: Support accessibility

Change-Id: Ida4ae767c45904a18aca577d79c918538125df62

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev
Christopher Tate [Thu, 21 Apr 2016 01:20:12 +0000 (01:20 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev
am: 157ae98762

* commit '157ae987627ce93939c40dc6f1f3913b243973ae':
  Only invoke k/v helpers during k/v operations

Change-Id: I5d44469ea4b888990109872493d0f5dfb61fd375

8 years agoMerge "PIP: Support accessibility" into nyc-dev
Jaewan Kim [Thu, 21 Apr 2016 01:20:10 +0000 (01:20 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
am: 34a96e704e

* commit '34a96e704e6bc12cc06d186ad7a344706a8afb5b':
  PIP: Support accessibility

Change-Id: I1eb23bb5f0db795b9196a7d7e311126ba5cf7e39

8 years agoMerge "Fix IME adjust in SysUI" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 01:17:55 +0000 (01:17 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev

8 years agoMerge "Only invoke k/v helpers during k/v operations" into nyc-dev
Chris Tate [Thu, 21 Apr 2016 01:12:06 +0000 (01:12 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev

8 years agoMerge "PIP: Support accessibility" into nyc-dev
Jaewan Kim [Thu, 21 Apr 2016 01:11:38 +0000 (01:11 +0000)]
Merge "PIP: Support accessibility" into nyc-dev

8 years agoOnly invoke k/v helpers during k/v operations
Christopher Tate [Tue, 12 Apr 2016 19:36:47 +0000 (12:36 -0700)]
Only invoke k/v helpers during k/v operations

In particular, don't try to call the k/v wallpaper restore helper's
onRestoreFinished() if we are actually doing a full-data restore.

Bug 28132784

Change-Id: I2eaf748f6d54601f0ca195ae2781aa177daf0b93

8 years agoMerge "Merge "Exclude IME dialogs from tap outside task bounds funcationality" into...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:10:56 +0000 (01:10 +0000)]
Merge "Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev am: 4d07c88919 am: df2e5aa494" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc...
Wale Ogunwale [Thu, 21 Apr 2016 01:10:36 +0000 (01:10 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev am: 4d07c88919
am: df2e5aa494

* commit 'df2e5aa49440b18b25156810ecbb4d42ee96a04a':

Change-Id: Ia3459819e8ed33e72b1e0eb27264b6092ce961c3

8 years agoMerge "Merge "Exclude IME dialogs from tap outside task bounds funcationality" into...
Android Build Merger (Role) [Thu, 21 Apr 2016 01:09:02 +0000 (01:09 +0000)]
Merge "Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev am: 4d07c88919 am: df2e5aa494" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc...
Wale Ogunwale [Thu, 21 Apr 2016 01:08:28 +0000 (01:08 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev am: 4d07c88919
am: df2e5aa494

* commit 'df2e5aa49440b18b25156810ecbb4d42ee96a04a':
  Exclude IME dialogs from tap outside task bounds funcationality

Change-Id: I793432b5131aa7a6952f84000d65ffb0f3853859

8 years agoMerge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc...
Wale Ogunwale [Thu, 21 Apr 2016 01:08:24 +0000 (01:08 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev am: 4d07c88919
am: 10138a7c3e

* commit '10138a7c3ed13c053c8ad222dacc8a02476a69c0':
  Exclude IME dialogs from tap outside task bounds funcationality

Change-Id: I6ab0badf196f657f315fc299c5fe0dded4c81ce8

8 years agoMerge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
Wale Ogunwale [Thu, 21 Apr 2016 01:06:20 +0000 (01:06 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
am: 4d07c88919

* commit '4d07c8891913a338d13ffe56133e24b0d167519f':
  Exclude IME dialogs from tap outside task bounds funcationality

Change-Id: I5840178b130a01e8db8441db628043221965bf5e

8 years agoMerge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
Wale Ogunwale [Thu, 21 Apr 2016 01:06:13 +0000 (01:06 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
am: 4d07c88919

* commit '4d07c8891913a338d13ffe56133e24b0d167519f':
  Exclude IME dialogs from tap outside task bounds funcationality

Change-Id: I5b02755cf0390c5ba0f7bbadebc1d4f0f52d117b

8 years agoMerge "Merge "Throw better exception when startVoiceActivity fails" into nyc-dev...
Android Build Merger (Role) [Thu, 21 Apr 2016 00:58:37 +0000 (00:58 +0000)]
Merge "Merge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc am: f70c55db09" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc...
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

8 years agoMerge "Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd am: 7116fb05e8...
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

8 years agoMerge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc
Amith Yamasani [Thu, 21 Apr 2016 00:57:41 +0000 (00:57 +0000)]
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc
am: f70c55db09

* commit 'f70c55db095522cf94dc6a982a39497add624f92':

Change-Id: I34b559ba9be3ef5446fff3d8c7dc9d1153870263

8 years agoMerge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am...
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

8 years agoMerge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd
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

8 years agoMerge "Merge "Throw better exception when startVoiceActivity fails" into nyc-dev...
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

8 years agoMerge "Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc...
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

8 years agoMerge "Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd am: 7116fb05e8...
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

8 years agoMerge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc
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

8 years agoMerge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am...
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

8 years agoMerge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc
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

8 years agoMerge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd
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

8 years agoMerge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am...
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

8 years agoMerge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd
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

8 years agoMerge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:54:31 +0000 (00:54 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev

8 years agoMerge "Throw better exception when startVoiceActivity fails" into nyc-dev
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

8 years agoMerge "Throw better exception when startVoiceActivity fails" into nyc-dev
Amith Yamasani [Thu, 21 Apr 2016 00:50:08 +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: I2666cf2bd09147e35a90ff21a45fc3a8944c49d8

8 years agoMerge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
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

8 years agoMerge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
Adam Lesinski [Thu, 21 Apr 2016 00:50:06 +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: I45d04bb852bf995b4f246fce3782dbeecafe24e4

8 years agoMerge "Fix logspam by JobInfo" into nyc-dev
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

8 years agoMerge "Fix logspam by JobInfo" into nyc-dev
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

8 years agoMerge "Throw better exception when startVoiceActivity fails" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:46:30 +0000 (00:46 +0000)]
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev

8 years agoMerge "Merge "Increase the max binder thread pool size for system_server." into nyc...
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

8 years agoMerge "Increase the max binder thread pool size for system_server." into nyc-dev...
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

8 years agoMerge "Merge "Increase the max binder thread pool size for system_server." into nyc...
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

8 years agoMerge "Increase the max binder thread pool size for system_server." into nyc-dev...
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

8 years agoMerge "Increase the max binder thread pool size for system_server." into nyc-dev...
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

8 years agoMerge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
Adam Lesinski [Thu, 21 Apr 2016 00:39:57 +0000 (00:39 +0000)]
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev

8 years agoMerge "Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4...
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

8 years agoMerge "Fix logspam by JobInfo" into nyc-dev
Dianne Hackborn [Thu, 21 Apr 2016 00:39:41 +0000 (00:39 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev

8 years agoMerge "Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev am: 206748d...
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

8 years agoMerge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4
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

8 years agoMerge "Increase the max binder thread pool size for system_server." into nyc-dev
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

8 years agoMerge "A11y: Fix battery icon and clock descriptions" into nyc-dev am: 206748d10e
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

8 years agoMerge "Increase the max binder thread pool size for system_server." into nyc-dev
Tim Murray [Thu, 21 Apr 2016 00:39:02 +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: I40cab5fe8638276c2784a30f5099723faba2afce

8 years agoMerge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4
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

8 years agoMerge "A11y: Fix battery icon and clock descriptions" into nyc-dev am: 206748d10e
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

8 years agoMerge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev...
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

8 years agoMerge "Disallow changing stacks if top activity" into nyc-dev am: 1fa356289e
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

8 years agoMerge "Prevent printing from finishing activity." into nyc-dev
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

8 years agoMerge "A11y: Fix battery icon and clock descriptions" into nyc-dev
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

8 years agoMerge "Prevent printing from finishing activity." into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:34:33 +0000 (00:34 +0000)]
Merge "Prevent printing from finishing activity." into nyc-dev
am: 41304f47f4

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

Change-Id: I4ab24c8ace1023c481244431bbac8cfbce4003a4

8 years agoMerge "A11y: Fix battery icon and clock descriptions" into nyc-dev
Adrian Roos [Thu, 21 Apr 2016 00:34:32 +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: I1d428b3c3f0d70ad275fb9d9bb1b39bcda8d3ac1

8 years agoMerge "Increase the max binder thread pool size for system_server." into nyc-dev
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

8 years agoMerge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev...
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

8 years agoMerge "Disallow changing stacks if top activity" into nyc-dev am: 1fa356289e
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

8 years agoMerge "Prevent printing from finishing activity." into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:31:41 +0000 (00:31 +0000)]
Merge "Prevent printing from finishing activity." into nyc-dev

8 years agoMerge "A11y: Fix battery icon and clock descriptions" into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:25:14 +0000 (00:25 +0000)]
Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev

8 years agoMerge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 28609360cf
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

8 years agoMerge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev...
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

8 years agoMerge "Removing disk access from startActivity thread" into nyc-dev am: 6c0ead993e
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

8 years agoMerge "Camera2: Ignore exception on double-completed capture sequences." into nyc...
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

8 years agoMerge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev...
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

8 years agoMerge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
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

8 years agoMerge "Set BugreportProgressService to run on foreground." into nyc-dev am: 3053c3f2a9
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

8 years agoMerge "Disallow changing stacks if top activity" into nyc-dev
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

8 years agoMerge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:23:28 +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: Ic913375a7d3e6d3fb664b2b046d9716e46511cc5

8 years agoMerge "Disallow changing stacks if top activity" into nyc-dev
Jorim Jaggi [Thu, 21 Apr 2016 00:23:25 +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: I6248a6442513af45fb2d8da09853eed12dd1c30d

8 years agoMerge "Add JavaDoc for View.updateDragShadow" into nyc-dev
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

8 years agoMerge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
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

8 years agoMerge "Removing disk access from startActivity thread" into nyc-dev
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

8 years agoMerge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
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

8 years agoMerge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
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

8 years agoMerge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
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