Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8140652e authored by Roshan Pius's avatar Roshan Pius
Browse files

Revert "svc(nfc): Use NfcAdapter API to enable/disable" 

This reverts commit 12058cb9.

Reason for revert: Fails telephony tests

Bug: 303286040
Test: N/A
Change-Id: I07c79f6d07ac8f7394698b8144e9310be2f3f1fe
parent 12058cb9

cmds/svc/src/com/android/commands/svc/NfcCommand.java

+18 −15
Original line number Original line Diff line number Diff line
@@ -16,10 +16,10 @@ 




package com.android.commands.svc;

package com.android.commands.svc;





import android.app.ActivityThread;

import android.content.Context;

import android.content.Context;

import android.nfc.NfcAdapter;

import android.nfc.INfcAdapter;

import android.nfc.NfcManager;

import android.os.RemoteException;

import android.os.ServiceManager;





public class NfcCommand extends Svc.Command {

public class NfcCommand extends Svc.Command {
@@ -42,17 +42,15 @@ public class NfcCommand extends Svc.Command { 




    @Override

    @Override

    public void run(String[] args) {

    public void run(String[] args) {

        Context context = ActivityThread.systemMain().getSystemContext();

        INfcAdapter adapter = INfcAdapter.Stub.asInterface(

        NfcManager nfcManager = context.getSystemService(NfcManager.class);

                ServiceManager.getService(Context.NFC_SERVICE));

        if (nfcManager == null) {



            System.err.println("Got a null NfcManager, is the system running?");

            return;

        }

        NfcAdapter adapter = nfcManager.getDefaultAdapter();

        if (adapter == null) {

        if (adapter == null) {

            System.err.println("Got a null NfcAdapter, is the system running?");

            System.err.println("Got a null NfcAdapter, is the system running?");

            return;

            return;

        }

        }



        try {

            if (args.length == 2 && "enable".equals(args[1])) {

            if (args.length == 2 && "enable".equals(args[1])) {

                adapter.enable();

                adapter.enable();

                return;

                return;
@@ -60,6 +58,11 @@ public class NfcCommand extends Svc.Command { 
                adapter.disable(true);

                adapter.disable(true);

                return;

                return;

            }

            }

        } catch (RemoteException e) {

            System.err.println("NFC operation failed: " + e);

            return;

        }



        System.err.println(longHelp());

        System.err.println(longHelp());

    }

    }