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

Commit fecc0bfb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the potential NPE when calling IPMS API and ExecutionException is... 

Merge "Fix the potential NPE when calling IPMS API and ExecutionException is thrown." into rvc-dev am: f6d4760c am: 95f08e0f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11882394

Change-Id: Id1c0f16e33f0d512a71358478d9f40ee872c4569
parents 9c384e13 95f08e0f

common/networkstackclient/src/android/net/IpMemoryStoreClient.java

+10 −4
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ public abstract class IpMemoryStoreClient { 
                    () -> service.storeNetworkAttributes(l2Key, attributes.toParcelable(),

                            OnStatusListener.toAIDL(listener))));

        } catch (ExecutionException m) {

            if (null == listener) return;

            ignoringRemoteException("Error storing network attributes",

                    () -> listener.onComplete(new Status(Status.ERROR_UNKNOWN)));

        }
@@ -116,6 +117,7 @@ public abstract class IpMemoryStoreClient { 
                    () -> service.storeBlob(l2Key, clientId, name, data,

                            OnStatusListener.toAIDL(listener))));

        } catch (ExecutionException m) {

            if (null == listener) return;

            ignoringRemoteException("Error storing blob",

                    () -> listener.onComplete(new Status(Status.ERROR_UNKNOWN)));

        }
@@ -143,7 +145,8 @@ public abstract class IpMemoryStoreClient { 
                            OnL2KeyResponseListener.toAIDL(listener))));

        } catch (ExecutionException m) {

            ignoringRemoteException("Error finding L2 Key",

                    () -> listener.onL2KeyResponse(new Status(Status.ERROR_UNKNOWN), null));

                    () -> listener.onL2KeyResponse(new Status(Status.ERROR_UNKNOWN),

                            null /* l2Key */));

        }

    }
@@ -164,7 +167,8 @@ public abstract class IpMemoryStoreClient { 
                            OnSameL3NetworkResponseListener.toAIDL(listener))));

        } catch (ExecutionException m) {

            ignoringRemoteException("Error checking for network sameness",

                    () -> listener.onSameL3NetworkResponse(new Status(Status.ERROR_UNKNOWN), null));

                    () -> listener.onSameL3NetworkResponse(new Status(Status.ERROR_UNKNOWN),

                            null /* response */));

        }

    }
@@ -186,7 +190,7 @@ public abstract class IpMemoryStoreClient { 
        } catch (ExecutionException m) {

            ignoringRemoteException("Error retrieving network attributes",

                    () -> listener.onNetworkAttributesRetrieved(new Status(Status.ERROR_UNKNOWN),

                            null, null));

                            null /* l2Key */, null /* attributes */));

        }

    }
@@ -210,7 +214,7 @@ public abstract class IpMemoryStoreClient { 
        } catch (ExecutionException m) {

            ignoringRemoteException("Error retrieving blob",

                    () -> listener.onBlobRetrieved(new Status(Status.ERROR_UNKNOWN),

                            null, null, null));

                            null /* l2Key */, null /* name */, null /* blob */));

        }

    }
@@ -235,6 +239,7 @@ public abstract class IpMemoryStoreClient { 
            runWhenServiceReady(service -> ignoringRemoteException(() ->

                    service.delete(l2Key, needWipe, OnDeleteStatusListener.toAIDL(listener))));

        } catch (ExecutionException m) {

            if (null == listener) return;

            ignoringRemoteException("Error deleting from the memory store",

                    () -> listener.onComplete(new Status(Status.ERROR_UNKNOWN),

                            0 /* deletedRecords */));
@@ -266,6 +271,7 @@ public abstract class IpMemoryStoreClient { 
                    () -> service.deleteCluster(cluster, needWipe,

                            OnDeleteStatusListener.toAIDL(listener))));

        } catch (ExecutionException m) {

            if (null == listener) return;

            ignoringRemoteException("Error deleting from the memory store",

                    () -> listener.onComplete(new Status(Status.ERROR_UNKNOWN),

                            0 /* deletedRecords */));