Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5e2f280652352a73c618899b53d3aa4b89549159
This commit is contained in:
Rambo Wang
2021-07-20 03:04:31 +00:00
committed by Automerger Merge Worker
parent 41de70158c 4696dc9bf8
commit d50451a030
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -13965,7 +13965,12 @@ public class TelephonyManager {
IBooleanConsumer aidlConsumer = callback == null ? null : new IBooleanConsumer.Stub() { IBooleanConsumer aidlConsumer = callback == null ? null : new IBooleanConsumer.Stub() {
@Override @Override
public void accept(boolean result) { public void accept(boolean result) {
final long identity = Binder.clearCallingIdentity();
try {
executor.execute(() -> callback.accept(result)); executor.execute(() -> callback.accept(result));
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
}; };

20
telephony/java/android/telephony/ims/ImsMmTelManager.java
View File

@@ -445,7 +445,12 @@ public class ImsMmTelManager implements RegistrationManager {
iTelephony.getImsMmTelRegistrationState(mSubId, new IIntegerConsumer.Stub() { iTelephony.getImsMmTelRegistrationState(mSubId, new IIntegerConsumer.Stub() {
@Override @Override
public void accept(int result) { public void accept(int result) {
final long identity = Binder.clearCallingIdentity();
try {
executor.execute(() -> stateCallback.accept(result)); executor.execute(() -> stateCallback.accept(result));
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
}); });
} catch (ServiceSpecificException | RemoteException e) { } catch (ServiceSpecificException | RemoteException e) {
@@ -487,7 +492,12 @@ public class ImsMmTelManager implements RegistrationManager {
new IIntegerConsumer.Stub() { new IIntegerConsumer.Stub() {
@Override @Override
public void accept(int result) { public void accept(int result) {
final long identity = Binder.clearCallingIdentity();
try {
executor.execute(() -> transportTypeCallback.accept(result)); executor.execute(() -> transportTypeCallback.accept(result));
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
}); });
} catch (ServiceSpecificException | RemoteException e) { } catch (ServiceSpecificException | RemoteException e) {
@@ -807,7 +817,12 @@ public class ImsMmTelManager implements RegistrationManager {
iTelephony.isMmTelCapabilitySupported(mSubId, new IIntegerConsumer.Stub() { iTelephony.isMmTelCapabilitySupported(mSubId, new IIntegerConsumer.Stub() {
@Override @Override
public void accept(int result) { public void accept(int result) {
final long identity = Binder.clearCallingIdentity();
try {
executor.execute(() -> callback.accept(result == 1)); executor.execute(() -> callback.accept(result == 1));
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
}, capability, transportType); }, capability, transportType);
} catch (ServiceSpecificException sse) { } catch (ServiceSpecificException sse) {
@@ -1452,7 +1467,12 @@ public class ImsMmTelManager implements RegistrationManager {
iTelephony.getImsMmTelFeatureState(mSubId, new IIntegerConsumer.Stub() { iTelephony.getImsMmTelFeatureState(mSubId, new IIntegerConsumer.Stub() {
@Override @Override
public void accept(int result) { public void accept(int result) {
final long identity = Binder.clearCallingIdentity();
try {
executor.execute(() -> callback.accept(result)); executor.execute(() -> callback.accept(result));
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
}); });
} catch (ServiceSpecificException sse) { } catch (ServiceSpecificException sse) {

10
telephony/java/android/telephony/ims/ImsRcsManager.java
View File

@@ -299,7 +299,12 @@ public class ImsRcsManager {
imsRcsController.getImsRcsRegistrationState(mSubId, new IIntegerConsumer.Stub() { imsRcsController.getImsRcsRegistrationState(mSubId, new IIntegerConsumer.Stub() {
@Override @Override
public void accept(int result) { public void accept(int result) {
final long identity = Binder.clearCallingIdentity();
try {
executor.execute(() -> stateCallback.accept(result)); executor.execute(() -> stateCallback.accept(result));
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
}); });
} catch (ServiceSpecificException | RemoteException e) { } catch (ServiceSpecificException | RemoteException e) {
@@ -345,7 +350,12 @@ public class ImsRcsManager {
new IIntegerConsumer.Stub() { new IIntegerConsumer.Stub() {
@Override @Override
public void accept(int result) { public void accept(int result) {
final long identity = Binder.clearCallingIdentity();
try {
executor.execute(() -> transportTypeCallback.accept(result)); executor.execute(() -> transportTypeCallback.accept(result));
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
}); });
} catch (ServiceSpecificException | RemoteException e) { } catch (ServiceSpecificException | RemoteException e) {