[webnfc] Do not disable reader mode if NFC is turned off

[webnfc] Do not disable NFC reader mode if nfc is turned off

Don't disable NFC reader mode when feature is turned off, since
the system NFC manager returns null NFCAdapter.

BUG=640890, 640995
Committed: https://crrev.com/da30dde29fbcf680a4453805e4b6aa7879d97a7b
Cr-Commit-Position: refs/heads/master@{#417003}

[shalamov, 2016-09-07 07:44:43]

The CQ bit was checked by alexander.shalamov@intel.com to run a CQ dry run

[commit-bot: I haz the power, 2016-09-07 07:45:02]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[shalamov, 2016-09-07 07:45:58]

alexander.shalamov@intel.com changed reviewers:
+ kenneth.christiansen@gmail.com, kenneth.r.christiansen@intel.com,
tedchoc@chromium.org

[shalamov, 2016-09-07 07:45:59]

PTAL

[shalamov, 2016-09-07 07:51:58]

Description was changed from

==========
[webnfc] Do not disable NFC reader mode if nfc is turned off

Don't disable NFC reader mode when feature is turned off, since
the system NFC manager returns null NFCAdapter.

BUG=640890
BUG=640995
==========

to

==========
[webnfc] Do not disable NFC reader mode if nfc is turned off

Don't disable NFC reader mode when feature is turned off, since
the system NFC manager returns null NFCAdapter.

BUG=640890
BUG=640995
==========

[shalamov, 2016-09-07 07:51:58]

alexander.shalamov@intel.com changed reviewers:
+ reillyg@chromium.org

[kenneth.r.christiansen, 2016-09-07 07:53:03]

lgtm

[shalamov, 2016-09-07 08:05:11]

Patchset #1 (id:1) has been deleted

[shalamov, 2016-09-07 08:20:53]

The CQ bit was checked by alexander.shalamov@intel.com to run a CQ dry run

[commit-bot: I haz the power, 2016-09-07 08:21:02]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-07 09:22:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-07 09:22:51]

Dry run: This issue passed the CQ dry run.

[Ted C, 2016-09-07 17:00:10]

lgtm

[shalamov, 2016-09-07 17:35:03]

The CQ bit was checked by alexander.shalamov@intel.com

[shalamov, 2016-09-07 17:35:04]

The patchset sent to the CQ was uploaded after l-g-t-m from
kenneth.r.christiansen@intel.com
Link to the patchset: https://codereview.chromium.org/2315203002/#ps20001
(title: "[webnfc] Do not disable NFC reader mode if nfc is turned off")

[commit-bot: I haz the power, 2016-09-07 17:35:25]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-07 17:42:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-07 17:42:30]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[shalamov, 2016-09-07 17:54:42]

Reilly, could you please take a look. Thanks.

[Reilly Grant (use Gerrit), 2016-09-07 18:14:35]

lgtm

[Reilly Grant (use Gerrit), 2016-09-07 18:14:47]

Description was changed from

==========
[webnfc] Do not disable NFC reader mode if nfc is turned off

Don't disable NFC reader mode when feature is turned off, since
the system NFC manager returns null NFCAdapter.

BUG=640890
BUG=640995
==========

to

==========
[webnfc] Do not disable NFC reader mode if nfc is turned off

Don't disable NFC reader mode when feature is turned off, since
the system NFC manager returns null NFCAdapter.

BUG=640890,640995
==========

[shalamov, 2016-09-07 18:26:37]

The CQ bit was checked by alexander.shalamov@intel.com

[commit-bot: I haz the power, 2016-09-07 18:27:35]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-07 18:33:36]

Committed patchset #1 (id:20001)

[commit-bot: I haz the power, 2016-09-07 18:35:23]

Description was changed from

==========
[webnfc] Do not disable NFC reader mode if nfc is turned off

Don't disable NFC reader mode when feature is turned off, since
the system NFC manager returns null NFCAdapter.

BUG=640890,640995
==========

to

==========
[webnfc] Do not disable NFC reader mode if nfc is turned off

Don't disable NFC reader mode when feature is turned off, since
the system NFC manager returns null NFCAdapter.

BUG=640890,640995

Committed: https://crrev.com/da30dde29fbcf680a4453805e4b6aa7879d97a7b
Cr-Commit-Position: refs/heads/master@{#417003}
==========

[commit-bot: I haz the power, 2016-09-07 18:35:27]

Patchset 1 (id:??) landed as
https://crrev.com/da30dde29fbcf680a4453805e4b6aa7879d97a7b
Cr-Commit-Position: refs/heads/master@{#417003}

[kenneth.christiansen, 2016-10-03 11:34:25]

Every time I try to cherry pick this into M52 with Drover I get the following:

git drover --branch 2840 --cherry-pick da30dde29fbcf680a4453805e4b6aa7879d97a7b

git drover --branch 2840 --cherry-pick da30dde29fbcf680a4453805e4b6aa7879d97a7b
Going to cherry-pick
"""
commit da30dde29fbcf680a4453805e4b6aa7879d97a7b
Author: alexander.shalamov <alexander.shalamov@intel.com>
Date:   Wed Sep 7 11:33:14 2016 -0700

    [webnfc] Do not disable NFC reader mode if nfc is turned off
    
    Don't disable NFC reader mode when feature is turned off, since
    the system NFC manager returns null NFCAdapter.
    
    BUG=640890,640995
    
    Review-Url: https://codereview.chromium.org/2315203002
    Cr-Commit-Position: refs/heads/master@{#417003}
"""
to 2840. Continue (y/n)? y

Using 50% similarity for rename/copy detection. Override with --similarity.

Running presubmit upload checks ...

Presubmit checks passed.
 device/nfc/android/java/src/org/chromium/device/nfc/NfcImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Upload server: https://codereview.chromium.org (change with -s/--server)

Got exception while uploading -- saving description to
/home/kenneth/.git_cl_description_backup

Error: Upload failed

[Reilly Grant (use Gerrit), 2016-10-04 07:57:34]

On 2016/10/03 at 11:34:25, kenneth.christiansen wrote:
> Every time I try to cherry pick this into M52 with Drover I get the following:
> 
> git drover --branch 2840 --cherry-pick
da30dde29fbcf680a4453805e4b6aa7879d97a7b
> 
> git drover --branch 2840 --cherry-pick
da30dde29fbcf680a4453805e4b6aa7879d97a7b
> Going to cherry-pick
> """
> commit da30dde29fbcf680a4453805e4b6aa7879d97a7b
> Author: alexander.shalamov <alexander.shalamov@intel.com>
> Date:   Wed Sep 7 11:33:14 2016 -0700
> 
>     [webnfc] Do not disable NFC reader mode if nfc is turned off
>     
>     Don't disable NFC reader mode when feature is turned off, since
>     the system NFC manager returns null NFCAdapter.
>     
>     BUG=640890,640995
>     
>     Review-Url: https://codereview.chromium.org/2315203002
>     Cr-Commit-Position: refs/heads/master@{#417003}
> """
> to 2840. Continue (y/n)? y
> 
> Using 50% similarity for rename/copy detection. Override with --similarity.
> 
> Running presubmit upload checks ...
> 
> Presubmit checks passed.
>  device/nfc/android/java/src/org/chromium/device/nfc/NfcImpl.java | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> Upload server: https://codereview.chromium.org (change with -s/--server)
> 
> Got exception while uploading -- saving description to
/home/kenneth/.git_cl_description_backup
> 
> Error: Upload failed

The scripts may be confused because one of the bugs already has the
merge-merged-2840 label. (By the way, you mean M54 instead of M52.)

[kenneth.r.christiansen, 2016-10-04 08:01:09]

> The scripts may be confused because one of the bugs already has the
merge-merged-2840 label. (By the way, you mean M54 instead of M52.)

So should we remove that label?

[Reilly Grant (use Gerrit), 2016-10-04 08:03:21]

On 2016/10/04 at 08:01:09, kenneth.r.christiansen wrote:
> > The scripts may be confused because one of the bugs already has the
merge-merged-2840 label. (By the way, you mean M54 instead of M52.)
> 
> So should we remove that label?

Try removing 640890 from the BUG= line. 640995 has the tags necessary to let you
merge it.

[shalamov, 2016-10-04 08:04:15]

On 2016/10/04 07:57:34, Reilly Grant wrote:
> merge-merged-2840 label. (By the way, you mean M54 instead of M52.)

Yes, it is M54, 2840.

[kenneth.christiansen, 2016-10-04 08:10:27]

On 2016/10/04 08:03:21, Reilly Grant wrote:
> On 2016/10/04 at 08:01:09, kenneth.r.christiansen wrote:
> > > The scripts may be confused because one of the bugs already has the
> merge-merged-2840 label. (By the way, you mean M54 instead of M52.)
> > 
> > So should we remove that label?
> 
> Try removing 640890 from the BUG= line. 640995 has the tags necessary to let
you
> merge it.

I removed it from the commit log when re-trying, but it still failed.

[Reilly Grant (use Gerrit), 2016-10-04 08:25:59]

On 2016/10/04 at 08:10:27, kenneth.christiansen wrote:
> On 2016/10/04 08:03:21, Reilly Grant wrote:
> > On 2016/10/04 at 08:01:09, kenneth.r.christiansen wrote:
> > > > The scripts may be confused because one of the bugs already has the
> > merge-merged-2840 label. (By the way, you mean M54 instead of M52.)
> > > 
> > > So should we remove that label?
> > 
> > Try removing 640890 from the BUG= line. 640995 has the tags necessary to let
you
> > merge it.
> 
> I removed it from the commit log when re-trying, but it still failed.

I've e-mailed infra-dev@ to try to get some help.

[Primiano Tucci (use gerrit), 2016-10-04 11:53:46]

On 2016/10/04 08:25:59, Reilly Grant wrote:
> On 2016/10/04 at 08:10:27, kenneth.christiansen wrote:
> > On 2016/10/04 08:03:21, Reilly Grant wrote:
> > > On 2016/10/04 at 08:01:09, kenneth.r.christiansen wrote:
> > > > > The scripts may be confused because one of the bugs already has the
> > > merge-merged-2840 label. (By the way, you mean M54 instead of M52.)
> > > > 
> > > > So should we remove that label?
> > > 
> > > Try removing 640890 from the BUG= line. 640995 has the tags necessary to
let
> you
> > > merge it.
> > 
> > I removed it from the commit log when re-trying, but it still failed.
> 
> I've e-mailed infra-dev@ to try to get some help.

I think the problem here is not the label, is the fact that the person trying to
do the merge (kenneth.christiansen) is not a committer.
Only committers can merge things in the release branches, for obvious security
reasons (even if you have LG on the CLs from valid committers)
Just ask a committer to merge this for you.

[kenneth.r.christiansen, 2016-10-04 12:47:55]

On 2016/10/04 at 11:53:46, primiano wrote:
> On 2016/10/04 08:25:59, Reilly Grant wrote:
> > On 2016/10/04 at 08:10:27, kenneth.christiansen wrote:
> > > On 2016/10/04 08:03:21, Reilly Grant wrote:
> > > > On 2016/10/04 at 08:01:09, kenneth.r.christiansen wrote:
> > > > > > The scripts may be confused because one of the bugs already has the
> > > > merge-merged-2840 label. (By the way, you mean M54 instead of M52.)
> > > > > 
> > > > > So should we remove that label?
> > > > 
> > > > Try removing 640890 from the BUG= line. 640995 has the tags necessary to
let
> > you
> > > > merge it.
> > > 
> > > I removed it from the commit log when re-trying, but it still failed.
> > 
> > I've e-mailed infra-dev@ to try to get some help.
> 
> I think the problem here is not the label, is the fact that the person trying
to do the merge (kenneth.christiansen) is not a committer.
> Only committers can merge things in the release branches, for obvious security
reasons (even if you have LG on the CLs from valid committers)
> Just ask a committer to merge this for you.

kenneth.r.christiansen@intel.com should be a committer.

[kenneth.r.christiansen, 2016-10-04 12:48:53]

> > 
> > I think the problem here is not the label, is the fact that the person
trying to do the merge (kenneth.christiansen) is not a committer.
> > Only committers can merge things in the release branches, for obvious
security reasons (even if you have LG on the CLs from valid committers)
> > Just ask a committer to merge this for you.
> 
> kenneth.r.christiansen@intel.com should be a committer.

And git config --global user.email does list that as the email

[Reilly Grant (use Gerrit), 2016-10-05 02:29:50]

On 2016/10/04 at 12:48:53, kenneth.r.christiansen wrote:
> > > 
> > > I think the problem here is not the label, is the fact that the person
trying to do the merge (kenneth.christiansen) is not a committer.
> > > Only committers can merge things in the release branches, for obvious
security reasons (even if you have LG on the CLs from valid committers)
> > > Just ask a committer to merge this for you.
> > 
> > kenneth.r.christiansen@intel.com should be a committer.
> 
> And git config --global user.email does list that as the email

I've merged this for you, but we should get this figured out. Perhaps the
authentication tokens git drover is using are from
kenneth.christiansen@gmail.com instead of kenneth.r.christiansen@intel.com. It
would be nice if the error messages were clearer.