OSDN Git Service
Ruchi Kandoi [Thu, 21 Apr 2016 02:48:58 +0000 (02:48 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am:
316c68f144
am:
dc84ddce39
* commit '
dc84ddce39e19ca37fa2ee0e82205bfaabcacfe7':
fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
Change-Id: I885d3053980e170ea086527ecc77a79f2f938f0d
Ruchi Kandoi [Thu, 21 Apr 2016 02:46:49 +0000 (02:46 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
am:
316c68f144
* commit '
316c68f144946a3019cc8f314921e8588c766b71':
fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
Change-Id: I591073412c162c14800475261936790da3c22ef5
Ruchi Kandoi [Thu, 21 Apr 2016 02:37:48 +0000 (02:37 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 02:20:32 +0000 (02:20 +0000)]
Merge "Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am:
f6496db8ce am:
795939499d" into nyc-mr1-dev-plus-aosp
Nathan Harold [Thu, 21 Apr 2016 02:20:12 +0000 (02:20 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am:
f6496db8ce
am:
795939499d
* commit '
795939499dbadb93508671841bc5276ee394a511':
Change-Id: Ibb7f50df2398fa908728285e1d33f8d7fc6c2569
Android Build Merger (Role) [Thu, 21 Apr 2016 02:18:35 +0000 (02:18 +0000)]
Merge "Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am:
f6496db8ce am:
795939499d" into nyc-mr1-dev-plus-aosp
Nathan Harold [Thu, 21 Apr 2016 02:18:13 +0000 (02:18 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am:
f6496db8ce
am:
795939499d
* commit '
795939499dbadb93508671841bc5276ee394a511':
Additional checks for ModemActivityInfo.isValid()
Change-Id: I62f8aaa28c2fed3aada88b9e724b9548f02ec4c9
Nathan Harold [Thu, 21 Apr 2016 02:18:11 +0000 (02:18 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am:
f6496db8ce
am:
2a403859b6
* commit '
2a403859b6ef90c30deffd1613c55471d4d1b086':
Additional checks for ModemActivityInfo.isValid()
Change-Id: Ieaf1840c8025913f4b9691884356d8b7256194ed
Nathan Harold [Thu, 21 Apr 2016 02:16:03 +0000 (02:16 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am:
f6496db8ce
* commit '
f6496db8cefe68b2d02fde22a68b84f7b5c86686':
Additional checks for ModemActivityInfo.isValid()
Change-Id: If8f3bb4e47ab526961dbb1209e69aa8dd09f5b40
Nathan Harold [Thu, 21 Apr 2016 02:16:00 +0000 (02:16 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am:
f6496db8ce
* commit '
f6496db8cefe68b2d02fde22a68b84f7b5c86686':
Additional checks for ModemActivityInfo.isValid()
Change-Id: Id4fb225d71e33bbfdf57dd13278fc71b4cd40370
Nathan Harold [Thu, 21 Apr 2016 02:09:26 +0000 (02:09 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 01:47:53 +0000 (01:47 +0000)]
Merge "Merge "Fix a11y key event handling from multiple devices." into nyc-dev am:
4b88bddb12 am:
38b5d99620" into nyc-mr1-dev-plus-aosp
Phil Weaver [Thu, 21 Apr 2016 01:47:26 +0000 (01:47 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev am:
4b88bddb12
am:
38b5d99620
* commit '
38b5d9962030b213f91f8c6998ecf2fca4595694':
Change-Id: I1b7a76c5784067715869bc343ffb4d2ddce2e903
Android Build Merger (Role) [Thu, 21 Apr 2016 01:45:55 +0000 (01:45 +0000)]
Merge "Merge "Fix a11y key event handling from multiple devices." into nyc-dev am:
4b88bddb12 am:
38b5d99620" into nyc-mr1-dev-plus-aosp
Phil Weaver [Thu, 21 Apr 2016 01:45:30 +0000 (01:45 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev am:
4b88bddb12
am:
38b5d99620
* commit '
38b5d9962030b213f91f8c6998ecf2fca4595694':
Fix a11y key event handling from multiple devices.
Change-Id: Ic456bae92dd5756d7c84629116194af64aad2edc
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
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
Phil Weaver [Thu, 21 Apr 2016 01:42:48 +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: I8da38100a98ab902033cfc290858a8da13c97ccd
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 21 Apr 2016 01:17:55 +0000 (01:17 +0000)]
Merge "Fix IME adjust in SysUI" 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
Jaewan Kim [Thu, 21 Apr 2016 01:11:38 +0000 (01:11 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 21 Apr 2016 00:46:30 +0000 (00:46 +0000)]
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
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
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
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
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
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
Adam Lesinski [Thu, 21 Apr 2016 00:39:57 +0000 (00:39 +0000)]
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
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
Dianne Hackborn [Thu, 21 Apr 2016 00:39:41 +0000 (00:39 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Philip P. Moltmann [Thu, 21 Apr 2016 00:31:41 +0000 (00:31 +0000)]
Merge "Prevent printing from finishing activity." 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