diff options
| author | Chalard Jean <jchalard@google.com> | 2019-04-22 02:15:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-22 02:15:04 +0000 |
| commit | 0fffc5ceb7e642166e9a7b9ef8ac3a69cbdc1773 (patch) | |
| tree | f7a98404c98b57ad6decf98f4191eed26e5fee0c /src | |
| parent | 64e5bd77cb9a325c2f6c58a294ed6ef4ae691d1c (diff) | |
| parent | 51903a1316aa1b17fbeec5e545c5c65541c1930b (diff) | |
Merge changes Id598ae1d,I475bd011
* changes:
Fix a possible crash when the listener is null
Straighten AIDL interface for the memory store
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java b/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java index 5650f21..bee4bbd 100644 --- a/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java +++ b/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java @@ -33,8 +33,8 @@ import android.net.IIpMemoryStore; import android.net.ipmemorystore.Blob; import android.net.ipmemorystore.IOnBlobRetrievedListener; import android.net.ipmemorystore.IOnL2KeyResponseListener; -import android.net.ipmemorystore.IOnNetworkAttributesRetrieved; -import android.net.ipmemorystore.IOnSameNetworkResponseListener; +import android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener; +import android.net.ipmemorystore.IOnSameL3NetworkResponseListener; import android.net.ipmemorystore.IOnStatusListener; import android.net.ipmemorystore.NetworkAttributes; import android.net.ipmemorystore.NetworkAttributesParcelable; @@ -297,16 +297,16 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub { */ @Override public void isSameNetwork(@Nullable final String l2Key1, @Nullable final String l2Key2, - @Nullable final IOnSameNetworkResponseListener listener) { + @Nullable final IOnSameL3NetworkResponseListener listener) { if (null == listener) return; mExecutor.execute(() -> { try { if (null == l2Key1 || null == l2Key2) { - listener.onSameNetworkResponse(makeStatus(ERROR_ILLEGAL_ARGUMENT), null); + listener.onSameL3NetworkResponse(makeStatus(ERROR_ILLEGAL_ARGUMENT), null); return; } if (null == mDb) { - listener.onSameNetworkResponse(makeStatus(ERROR_ILLEGAL_ARGUMENT), null); + listener.onSameL3NetworkResponse(makeStatus(ERROR_ILLEGAL_ARGUMENT), null); return; } try { @@ -315,16 +315,16 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub { final NetworkAttributes attr2 = IpMemoryStoreDatabase.retrieveNetworkAttributes(mDb, l2Key2); if (null == attr1 || null == attr2) { - listener.onSameNetworkResponse(makeStatus(SUCCESS), + listener.onSameL3NetworkResponse(makeStatus(SUCCESS), new SameL3NetworkResponse(l2Key1, l2Key2, -1f /* never connected */).toParcelable()); return; } final float confidence = attr1.getNetworkGroupSamenessConfidence(attr2); - listener.onSameNetworkResponse(makeStatus(SUCCESS), + listener.onSameL3NetworkResponse(makeStatus(SUCCESS), new SameL3NetworkResponse(l2Key1, l2Key2, confidence).toParcelable()); } catch (Exception e) { - listener.onSameNetworkResponse(makeStatus(ERROR_GENERIC), null); + listener.onSameL3NetworkResponse(makeStatus(ERROR_GENERIC), null); } } catch (final RemoteException e) { // Client at the other end died @@ -343,7 +343,7 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub { */ @Override public void retrieveNetworkAttributes(@Nullable final String l2Key, - @Nullable final IOnNetworkAttributesRetrieved listener) { + @Nullable final IOnNetworkAttributesRetrievedListener listener) { if (null == listener) return; mExecutor.execute(() -> { try { |