From 566b03f4b7aeb5632cc2e3733627f0a47606cd0e Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Thu, 18 Oct 2018 16:02:51 -0700 Subject: [PATCH] Move Binder.clearCallingIdentity Move the clearCallingIdentity call outside the executor Change-Id: Ic87c2f8e2b1874bd4405b25b1682b5b1a7d900cb Fixes: 117794412 Test: CTS --- .../InternalDownloadProgressListener.java | 18 ++-- .../mbms/InternalDownloadSessionCallback.java | 54 +++++------ .../mbms/InternalDownloadStatusListener.java | 18 ++-- .../mbms/InternalGroupCallCallback.java | 54 +++++------ .../InternalGroupCallSessionCallback.java | 72 +++++++-------- .../InternalStreamingServiceCallback.java | 90 +++++++++---------- .../InternalStreamingSessionCallback.java | 54 +++++------ 7 files changed, 180 insertions(+), 180 deletions(-) diff --git a/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java b/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java index 403f758a1996c..6a135694869c6 100644 --- a/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java +++ b/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java @@ -43,18 +43,18 @@ public class InternalDownloadProgressListener extends IDownloadProgressListener. return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppListener.onProgressUpdated(request, fileInfo, currentDownloadSize, fullDownloadSize, currentDecodedSize, fullDecodedSize); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } public void stop() { diff --git a/telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java b/telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java index 2916f81c8cd27..ce32477b443b5 100644 --- a/telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java +++ b/telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java @@ -40,17 +40,17 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onError(errorCode, message); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -59,17 +59,17 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onFileServicesUpdated(services); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -78,17 +78,17 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onMiddlewareReady(); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } public void stop() { diff --git a/telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java b/telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java index ad6bb54ad8fa2..87163ff8b32c4 100644 --- a/telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java +++ b/telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java @@ -42,17 +42,17 @@ public class InternalDownloadStatusListener extends IDownloadStatusListener.Stub return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppListener.onStatusUpdated(request, fileInfo, status); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } public void stop() { diff --git a/telephony/java/android/telephony/mbms/InternalGroupCallCallback.java b/telephony/java/android/telephony/mbms/InternalGroupCallCallback.java index 2910bb313d84f..c7600b6c78433 100644 --- a/telephony/java/android/telephony/mbms/InternalGroupCallCallback.java +++ b/telephony/java/android/telephony/mbms/InternalGroupCallCallback.java @@ -38,17 +38,17 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub { return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onError(errorCode, message); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -57,17 +57,17 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub { return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onGroupCallStateChanged(state, reason); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -76,17 +76,17 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub { return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onBroadcastSignalStrengthUpdated(signalStrength); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } /** Prevents this callback from calling the app */ diff --git a/telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java b/telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java index 4c9cf4dd7c926..0b7667ec525c8 100644 --- a/telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java +++ b/telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java @@ -39,17 +39,17 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onError(errorCode, message); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -58,17 +58,17 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onAvailableSaisUpdated(currentSais, availableSais); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -77,17 +77,17 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onServiceInterfaceAvailable(interfaceName, index); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -96,17 +96,17 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onMiddlewareReady(); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } /** Prevents this callback from calling the app */ diff --git a/telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java b/telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java index e9f39ff959ccc..3a4ed08ed9549 100644 --- a/telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java +++ b/telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java @@ -39,17 +39,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onError(errorCode, message); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -58,17 +58,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onStreamStateUpdated(state, reason); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -77,17 +77,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onMediaDescriptionUpdated(); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -96,17 +96,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onBroadcastSignalStrengthUpdated(signalStrength); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -115,17 +115,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onStreamMethodUpdated(methodType); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } public void stop() { diff --git a/telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java b/telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java index d47f5adbaf91c..2eb280e741067 100644 --- a/telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java +++ b/telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java @@ -40,17 +40,17 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onError(errorCode, message); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -60,17 +60,17 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onStreamingServicesUpdated(services); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } @Override @@ -79,17 +79,17 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb return; } - mExecutor.execute(new Runnable() { - @Override - public void run() { - long token = Binder.clearCallingIdentity(); - try { + long token = Binder.clearCallingIdentity(); + try { + mExecutor.execute(new Runnable() { + @Override + public void run() { mAppCallback.onMiddlewareReady(); - } finally { - Binder.restoreCallingIdentity(token); } - } - }); + }); + } finally { + Binder.restoreCallingIdentity(token); + } } public void stop() {