GitLab

Bug: 29451566
Change-Id: I26b0a2e9b33854efd59b95ab230a6db3042f93c7

Bug: 28300969
Change-Id: Icadfe70cd06f921badd266e7a4efbae15a8c206a

Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e8314992 am: 19108b58 am: 63280fe6 am: f96895a2 am: 740e0726 am: 7390f09a
am: 755d0a2d

* commit '755d0a2d':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef am: 921fe1ae am: 29c75386 am: 5be57758 am: 784ae49e am: 3fdb2ab3 am: 7aeb11db am: 1c272898
am: 21ee8b28

* commit '21ee8b28':

Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e8314992 am: 19108b58 am: 63280fe6 am: f96895a2 am: 740e0726
am: 7390f09a

* commit '7390f09a':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef am: 921fe1ae am: 29c75386 am: 5be57758 am: 784ae49e am: 3fdb2ab3 am: 7aeb11db
am: 1c272898

* commit '1c272898':

Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e8314992 am: 19108b58 am: 63280fe6 am: f96895a2
am: 740e0726

* commit '740e0726':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef am: 921fe1ae am: 29c75386 am: 5be57758 am: 784ae49e am: 3fdb2ab3
am: 7aeb11db

* commit '7aeb11db':

Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e8314992 am: 19108b58 am: 63280fe6
am: f96895a2

* commit 'f96895a2':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef am: 921fe1ae am: 29c75386 am: 5be57758 am: 784ae49e
am: 3fdb2ab3

* commit '3fdb2ab3':

Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e8314992 am: 19108b58
am: 63280fe6

* commit '63280fe6':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef am: 921fe1ae am: 29c75386 am: 5be57758
am: 784ae49e

* commit '784ae49e':

Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e8314992
am: 19108b58

* commit '19108b58':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef am: 921fe1ae am: 29c75386
am: 5be57758

* commit '5be57758':

Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev
am: e8314992

* commit 'e8314992':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef am: 921fe1ae
am: 29c75386

* commit '29c75386':

Merge branch 'klp-modular-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef
am: 921fe1ae

* commit '921fe1ae':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef
am: 921fe1ae

* commit '921fe1ae':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3
am: 27602cef

* commit '27602cef':

Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14
am: 80fa64f3

* commit '80fa64f3':

am: 38c77c14

* commit '38c77c14':

am: a7d4ead2

* commit 'a7d4ead2':

am: 37d9ace7

* commit '37d9ace7':

am: 24810962

* commit '24810962':

am: 29b858a5

* commit '29b858a5':

Bug: 24426328
Change-Id: I70ea074cb3346c991b4402676cef5729c2b911a3

The build system now has a better implementation of all-cpp-files-under

Bug: 24204119
Change-Id: I9e1bf90559a894897ae829cb4f713cc5796584bc

Change-Id: Ie6c0a5378c185fda28e4d29ff2ef001b9c6e2cbd
Auto-generated-cl: translation import

The NFC process can create and modify WiFi
network configurations based on data read
from NFC tags. Starting with M, processes
modifying WiFi configurations they did
not create need a new permission.

Bug: 23092392
Change-Id: I342815873153138e6317b79d23e1235e6c92c964

Change-Id: I520df3ee126befdec227fb01584b75731519bd25
Auto-generated-cl: translation import

Support NXP Mifare Classic tag.

Bug: 23618022
Change-Id: If674b493bba7596803738f8c3d22b7ce89a0fa8b

* commit '14687fef':
  Fix crash when invoking Beam with NFC off.

M no longer allows NoDisplay activities
to display a dialog (makes sense).

Bug: 23369785
Bug: 22624216
Change-Id: Ibfec67fc9c75cdacd16e0acd4e11d6d3cbb71d30

If RF discovery is started, discovery should be temporarily
stopped before deregister peer-to-peer server.

Bug: 22283840
Change-Id: I42c826454f050e09b3d673b89560a8c7bed728d7

Support Mifare DESFire tag format

Change-Id: I362dc5c539ea7e5c749ca677f88d859d489a74d8

Use protocol definition from .conf file in
libnfc-nci instead of fixed value.

Change-Id: Ib8a74304974de3396a2f9cc644bce3dc07421f21

* commit '79458517':
  Fix NFC onManualBeamInvoke issue with policy