diff options
| author | 2024-03-21 22:49:03 +0000 | |
|---|---|---|
| committer | 2024-03-21 22:49:03 +0000 | |
| commit | eaece842e8a3c46718af5f166a55c3a6da4f9227 (patch) | |
| tree | 8cf786a65ef42519571b07269fe32ca06fdab92b | |
| parent | 1914e7340a6092479e6851ee1d722aa936a249f9 (diff) | |
| parent | 197bd3ad254edabaff00cdfc703473fa5d89f988 (diff) | |
Merge "[nfc] Pass in package name to nfcService when enabling nfc." into main
| -rw-r--r-- | nfc/java/android/nfc/INfcAdapter.aidl | 4 | ||||
| -rw-r--r-- | nfc/java/android/nfc/NfcAdapter.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nfc/java/android/nfc/INfcAdapter.aidl b/nfc/java/android/nfc/INfcAdapter.aidl index c444740a5b1b..7a78f3d17e1e 100644 --- a/nfc/java/android/nfc/INfcAdapter.aidl +++ b/nfc/java/android/nfc/INfcAdapter.aidl @@ -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(); diff --git a/nfc/java/android/nfc/NfcAdapter.java b/nfc/java/android/nfc/NfcAdapter.java index 0ebc3f5178e0..7a7db31fd417 100644 --- a/nfc/java/android/nfc/NfcAdapter.java +++ b/nfc/java/android/nfc/NfcAdapter.java @@ -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."); } |