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

Commit 386e25e6 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Clear binder identity in callback of IMS IPC interfaces" into sc-dev am: 4696dc9b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329696

Change-Id: I9d6ad335154fd7722f1a5f8a4be6009c69931fc8
parents 2331d8ca 4696dc9b

telephony/java/android/telephony/TelephonyManager.java

+6 −1
Original line number Diff line number Diff line
@@ -13965,7 +13965,12 @@ public class TelephonyManager { 
        IBooleanConsumer aidlConsumer = callback == null ? null : new IBooleanConsumer.Stub() {

            @Override

            public void accept(boolean result) {

                final long identity = Binder.clearCallingIdentity();

                try {

                    executor.execute(() -> callback.accept(result));

                } finally {

                    Binder.restoreCallingIdentity(identity);

                }

            }

        };

























telephony/java/android/telephony/ims/ImsMmTelManager.java



+24
−4




























Original line number
Diff line number
Diff line








@@ -445,7 +445,12 @@ public class ImsMmTelManager implements RegistrationManager {













            iTelephony.getImsMmTelRegistrationState(mSubId, new IIntegerConsumer.Stub() {















                @Override















                public void accept(int result) {













                    final long identity = Binder.clearCallingIdentity();













                    try {















                        executor.execute(() -> stateCallback.accept(result));













                    } finally {













                        Binder.restoreCallingIdentity(identity);













                    }















                }















            });















        } catch (ServiceSpecificException | RemoteException e) {










@@ -487,7 +492,12 @@ public class ImsMmTelManager implements RegistrationManager {













                    new IIntegerConsumer.Stub() {















                        @Override















                        public void accept(int result) {













                            final long identity = Binder.clearCallingIdentity();













                            try {















                                executor.execute(() -> transportTypeCallback.accept(result));













                            } finally {













                                Binder.restoreCallingIdentity(identity);













                            }















                        }















                    });















        } catch (ServiceSpecificException | RemoteException e) {










@@ -807,7 +817,12 @@ public class ImsMmTelManager implements RegistrationManager {













            iTelephony.isMmTelCapabilitySupported(mSubId, new IIntegerConsumer.Stub() {















                @Override















                public void accept(int result) {













                    final long identity = Binder.clearCallingIdentity();













                    try {















                        executor.execute(() -> callback.accept(result == 1));













                    } finally {













                        Binder.restoreCallingIdentity(identity);













                    }















                }















            }, capability, transportType);















        } catch (ServiceSpecificException sse) {










@@ -1452,7 +1467,12 @@ public class ImsMmTelManager implements RegistrationManager {













            iTelephony.getImsMmTelFeatureState(mSubId, new IIntegerConsumer.Stub() {















                @Override















                public void accept(int result) {













                    final long identity = Binder.clearCallingIdentity();













                    try {















                        executor.execute(() -> callback.accept(result));













                    } finally {













                        Binder.restoreCallingIdentity(identity);













                    }















                }















            });















        } catch (ServiceSpecificException sse) {

































telephony/java/android/telephony/ims/ImsRcsManager.java



+12
−2




























Original line number
Diff line number
Diff line








@@ -299,7 +299,12 @@ public class ImsRcsManager {













            imsRcsController.getImsRcsRegistrationState(mSubId, new IIntegerConsumer.Stub() {















                @Override















                public void accept(int result) {













                    final long identity = Binder.clearCallingIdentity();













                    try {















                        executor.execute(() -> stateCallback.accept(result));













                    } finally {













                        Binder.restoreCallingIdentity(identity);













                    }















                }















            });















        } catch (ServiceSpecificException | RemoteException e) {










@@ -345,7 +350,12 @@ public class ImsRcsManager {













                    new IIntegerConsumer.Stub() {















                        @Override















                        public void accept(int result) {













                            final long identity = Binder.clearCallingIdentity();













                            try {















                                executor.execute(() -> transportTypeCallback.accept(result));













                            } finally {













                                Binder.restoreCallingIdentity(identity);













                            }















                        }















                    });















        } catch (ServiceSpecificException | RemoteException e) {