Merge "[nfc] Pass in package name to nfcService when enabling nfc." into main (eaece842) · Commits · e / os / android_frameworks_base

nfc/java/android/nfc/INfcAdapter.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,8 +47,8 @@ interface INfcAdapter
		INfcAdapterExtras getNfcAdapterExtrasInterface(in String pkg);
		INfcDta getNfcDtaInterface(in String pkg);
		int getState();
		boolean disable(boolean saveState);
		boolean enable();
		boolean disable(boolean saveState, in String pkg);
		boolean enable(in String pkg);
		void pausePolling(int timeoutInMs);
		void resumePolling();

nfc/java/android/nfc/NfcAdapter.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -1117,7 +1117,7 @@ public final class NfcAdapter {
		@RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)
		public boolean enable() {
		try {
		return sService.enable();
		return sService.enable(mContext.getPackageName());
		} catch (RemoteException e) {
		attemptDeadServiceRecovery(e);
		// Try one more time
		@@ -1126,7 +1126,7 @@ public final class NfcAdapter {
		return false;
		}
		try {
		return sService.enable();
		return sService.enable(mContext.getPackageName());
		} catch (RemoteException ee) {
		Log.e(TAG, "Failed to recover NFC Service.");
		}
		@@ -1156,7 +1156,7 @@ public final class NfcAdapter {
		@RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)
		public boolean disable() {
		try {
		return sService.disable(true);
		return sService.disable(true, mContext.getPackageName());
		} catch (RemoteException e) {
		attemptDeadServiceRecovery(e);
		// Try one more time
		@@ -1165,7 +1165,7 @@ public final class NfcAdapter {
		return false;
		}
		try {
		return sService.disable(true);
		return sService.disable(true, mContext.getPackageName());
		} catch (RemoteException ee) {
		Log.e(TAG, "Failed to recover NFC Service.");
		}
		@@ -1181,7 +1181,7 @@ public final class NfcAdapter {
		@RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)
		public boolean disable(boolean persist) {
		try {
		return sService.disable(persist);
		return sService.disable(persist, mContext.getPackageName());
		} catch (RemoteException e) {
		attemptDeadServiceRecovery(e);
		// Try one more time
		@@ -1190,7 +1190,7 @@ public final class NfcAdapter {
		return false;
		}
		try {
		return sService.disable(persist);
		return sService.disable(persist, mContext.getPackageName());
		} catch (RemoteException ee) {
		Log.e(TAG, "Failed to recover NFC Service.");
		}