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

Commit 34856c5f 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" am: 67e10842... 

Merge "Clear binder identity in callback of IMS IPC interfaces" am: 67e10842 am: 3d97b23a am: e5026e25

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

Change-Id: I3d2a499fcfd72c61605ba345b0b576ea7896370f
parents cd9035dd e5026e25

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) {