OSDN Git Service
Hugo Benichi [Thu, 21 Apr 2016 04:06:11 +0000 (04:06 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev am:
75f0346167
am:
27656e0352
* commit '
27656e0352fe2870d755ec9b770ddbc2aab71b52':
Various fixes in IpReachability event logging
Change-Id: Ia3dceb1d659ecee2a76fbfe1c04f3db085d6867e
Hugo Benichi [Thu, 21 Apr 2016 04:03:58 +0000 (04:03 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev
am:
75f0346167
* commit '
75f0346167f9b8beb8d4b941e7a4ca8228e0737a':
Various fixes in IpReachability event logging
Change-Id: Ia20b9ef1a949b6474a5e09b096e6d34e41f316aa
Hugo Benichi [Thu, 21 Apr 2016 03:54:17 +0000 (03:54 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 03:48:53 +0000 (03:48 +0000)]
Merge "Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am:
333e808b34 am:
cf63c62a0a" into nyc-mr1-dev-plus-aosp
Felipe Leme [Thu, 21 Apr 2016 03:48:27 +0000 (03:48 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am:
333e808b34
am:
cf63c62a0a
* commit '
cf63c62a0ac2f4f56e06c6f1f095f654e4a27982':
Change-Id: I613fa9f866cb874ee8e7140ba29e5c598210d9b8
Android Build Merger (Role) [Thu, 21 Apr 2016 03:46:55 +0000 (03:46 +0000)]
Merge "Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am:
333e808b34 am:
cf63c62a0a" into nyc-mr1-dev-plus-aosp
Felipe Leme [Thu, 21 Apr 2016 03:46:25 +0000 (03:46 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am:
333e808b34
am:
cf63c62a0a
* commit '
cf63c62a0ac2f4f56e06c6f1f095f654e4a27982':
Removed obsolete screenshot mention from full bugreport.
Change-Id: I326388f1a11058a203abbb2fa35b6019801a2a90
Felipe Leme [Thu, 21 Apr 2016 03:46:22 +0000 (03:46 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev am:
333e808b34
am:
abb2d9fee2
* commit '
abb2d9fee27e76b80d9826a4eab2aecc32e854f2':
Removed obsolete screenshot mention from full bugreport.
Change-Id: I34ba723067093e08a43973740d92aeb19cb9f1cd
Felipe Leme [Thu, 21 Apr 2016 03:44:15 +0000 (03:44 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
am:
333e808b34
* commit '
333e808b34397258457813b6d7d970da72e76925':
Removed obsolete screenshot mention from full bugreport.
Change-Id: Ieba4b10f6b46e1805e28288b9ada2e48417cf66b
Felipe Leme [Thu, 21 Apr 2016 03:44:13 +0000 (03:44 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
am:
333e808b34
* commit '
333e808b34397258457813b6d7d970da72e76925':
Removed obsolete screenshot mention from full bugreport.
Change-Id: I28e2617e7ee6efeeea025120637794584cdfd42d
TreeHugger Robot [Thu, 21 Apr 2016 03:34:45 +0000 (03:34 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
Adrian Roos [Thu, 21 Apr 2016 03:31:14 +0000 (03:31 +0000)]
Merge "Remove obsolete TODO" into nyc-dev am:
568e63bc9b
am:
8047bed6a3
* commit '
8047bed6a389e3abfa8fd2d860670f571c7002a3':
Change-Id: I5b0b6995627e840af28d6a7c9206bc8dfce49821
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:31:11 +0000 (03:31 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev am:
69e3618f07
am:
caad05bf83
* commit '
caad05bf83e9d4158d25865345b7712ca92a51d2':
Change-Id: Ie1168893c2221b5096cef921897a3cec1380f3b5
Adrian Roos [Thu, 21 Apr 2016 03:28:22 +0000 (03:28 +0000)]
Merge "Remove obsolete TODO" into nyc-dev am:
568e63bc9b
am:
9d614a55b0
* commit '
9d614a55b01ba4baee566f604b4d5bc6b52d389f':
Remove obsolete TODO
Change-Id: I6fc62d8c996652ebc6b2ef30731915754fa31cda
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:28:20 +0000 (03:28 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev am:
69e3618f07
am:
559b2bb8c1
* commit '
559b2bb8c1ef1f3f0788b352e7117e1114552700':
Do not make files in zip disabled in ACTION_VIEW.
Change-Id: Ib0ca69eefc17f469806036f8d0dd0ccf98a185ea
Adrian Roos [Thu, 21 Apr 2016 03:26:06 +0000 (03:26 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
am:
568e63bc9b
* commit '
568e63bc9b53537505016f41e48e908c4da863e5':
Remove obsolete TODO
Change-Id: I11019dd003ed10184a0c0808b6d1021c5b2ecc40
Adrian Roos [Thu, 21 Apr 2016 03:26:03 +0000 (03:26 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
am:
568e63bc9b
* commit '
568e63bc9b53537505016f41e48e908c4da863e5':
Remove obsolete TODO
Change-Id: Iaf25259e51d0f4b69d58dc918033299e88aab124
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:26:03 +0000 (03:26 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
am:
69e3618f07
* commit '
69e3618f07be6f48bfc37c52e6ef5830f717b495':
Do not make files in zip disabled in ACTION_VIEW.
Change-Id: I9908e4db12640251a5fd60ca0fff950078d628aa
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:26:01 +0000 (03:26 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
am:
69e3618f07
* commit '
69e3618f07be6f48bfc37c52e6ef5830f717b495':
Do not make files in zip disabled in ACTION_VIEW.
Change-Id: I6c4749738e1bc6116e4e56c494932a62d2c16ac9
TreeHugger Robot [Thu, 21 Apr 2016 03:18:46 +0000 (03:18 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:17:01 +0000 (03:17 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
Android Build Merger (Role) [Thu, 21 Apr 2016 02:51:19 +0000 (02:51 +0000)]
Merge "Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am:
316c68f144 am:
dc84ddce39" into nyc-mr1-dev-plus-aosp
Ruchi Kandoi [Thu, 21 Apr 2016 02:50:54 +0000 (02:50 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am:
316c68f144
am:
dc84ddce39
* commit '
dc84ddce39e19ca37fa2ee0e82205bfaabcacfe7':
Change-Id: I24ad66942da711c0a9596cedc20c5700c8055845
Android Build Merger (Role) [Thu, 21 Apr 2016 02:49:20 +0000 (02:49 +0000)]
Merge "Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am:
316c68f144 am:
dc84ddce39" into nyc-mr1-dev-plus-aosp
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:48:55 +0000 (02:48 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am:
316c68f144
am:
fb8c76df29
* commit '
fb8c76df299c8bc2f9702697fefc3ebe3e9a3a43':
fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
Change-Id: Ieb496122f9a6203f5022d5875e4ccbded739dbbc
Ruchi Kandoi [Thu, 21 Apr 2016 02:46:51 +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: If4cc351b8674343cbb83e22bcfccf9e7b4d00484
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
Adrian Roos [Thu, 21 Apr 2016 01:36:18 +0000 (18:36 -0700)]
Remove obsolete TODO
Change-Id: Ia76b7f1cea0799c46ae5c933741c865869e39f5f
Fixes:
27550895
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
OSDN Git Service
