Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Simplify NfcCommand and avoid NullPointerExceptions"

Browse Source
This commit is contained in:
Treehugger Robot
2017-06-17 01:25:12 +00:00
committed by Gerrit Code Review
parent 7d136b777a d3375090aa
commit b5c4e80ecd
1 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
cmds/svc/src/com/android/commands/svc/NfcCommand.java
View File

@@ -17,8 +17,6 @@
package com.android.commands.svc;
import android.content.Context;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.nfc.INfcAdapter;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -44,42 +42,27 @@ public class NfcCommand extends Svc.Command {
@Override
public void run(String[] args) {
boolean validCommand = false;
if (args.length >= 2) {
boolean flag = false;
if ("enable".equals(args[1])) {
flag = true;
validCommand = true;
} else if ("disable".equals(args[1])) {
flag = false;
validCommand = true;
}
if (validCommand) {
IPackageManager pm = IPackageManager.Stub.asInterface(
ServiceManager.getService("package"));
try {
if (pm.hasSystemFeature(PackageManager.FEATURE_NFC, 0) ||
pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION, 0)) {
INfcAdapter nfc = INfcAdapter.Stub
.asInterface(ServiceManager.getService(Context.NFC_SERVICE));
try {
if (flag) {
nfc.enable();
} else
nfc.disable(true);
} catch (RemoteException e) {
System.err.println("NFC operation failed: " + e);
}
} else {
System.err.println("NFC feature not supported.");
}
} catch (RemoteException e) {
System.err.println("RemoteException while calling PackageManager, is the "
+ "system running?");
}
INfcAdapter adapter = INfcAdapter.Stub.asInterface(
ServiceManager.getService(Context.NFC_SERVICE));
if (adapter == null) {
System.err.println("Got a null NfcAdapter, is the system running?");
return;
}
try {
if (args.length == 2 && "enable".equals(args[1])) {
adapter.enable();
return;
} else if (args.length == 2 && "disable".equals(args[1])) {
adapter.disable(true);
return;
}
} catch (RemoteException e) {
System.err.println("NFC operation failed: " + e);
return;
}
System.err.println(longHelp());
}