diff options
8 files changed, 182 insertions, 181 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 721ce547d64b..c585cf1f858e 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -2233,9 +2233,10 @@ public class SubscriptionManager { * Provide all available user downloaded profiles on phone which are used only for * opportunistic data. * @param slotIndex slot on which the profiles are queried from. + * @return the list of opportunistic subscription info. If none exists, an empty list. */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) - public List<SubscriptionInfo> getOpportunisticSubscriptions(int slotIndex) { + public @NonNull List<SubscriptionInfo> getOpportunisticSubscriptions(int slotIndex) { String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>"; List<SubscriptionInfo> subInfoList = null; diff --git a/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java b/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java index 403f758a1996..6a135694869c 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 2916f81c8cd2..ce32477b443b 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 ad6bb54ad8fa..87163ff8b32c 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 2910bb313d84..c7600b6c7843 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 4c9cf4dd7c92..0b7667ec525c 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 e9f39ff959cc..3a4ed08ed954 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 d47f5adbaf91..2eb280e74106 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() { |