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

Commit da694a50 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Set sIsInitialized to false and add logging" am: a0a70be2 am:... 

Merge "Merge "Set sIsInitialized to false and add logging" am: a0a70be2 am: cfa4bb4b am: a7d19590"
parents ebc8175f 9c649e6f

telephony/java/android/telephony/MbmsDownloadSession.java

+10 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ public class MbmsDownloadSession implements AutoCloseable { 


                    @Override

                    public void onServiceDisconnected(ComponentName name) {

                        Log.w(LOG_TAG, "bindAndInitialize: Remote service disconnected");

                        sIsInitialized.set(false);

                        mService.set(null);

                    }
@@ -385,6 +386,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
        } catch (RemoteException e) {

            Log.w(LOG_TAG, "Remote process died");

            mService.set(null);

            sIsInitialized.set(false);

            sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

        }

    }
@@ -438,6 +440,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
            }

        } catch (RemoteException e) {

            mService.set(null);

            sIsInitialized.set(false);

            sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

            return;

        }
@@ -521,6 +524,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
            downloadService.download(request);

        } catch (RemoteException e) {

            mService.set(null);

            sIsInitialized.set(false);

            sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

        }

    }
@@ -542,6 +546,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
            return downloadService.listPendingDownloads(mSubscriptionId);

        } catch (RemoteException e) {

            mService.set(null);

            sIsInitialized.set(false);

            sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

            return Collections.emptyList();

        }
@@ -583,6 +588,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
            }

        } catch (RemoteException e) {

            mService.set(null);

            sIsInitialized.set(false);

            sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

            return;

        }
@@ -622,6 +628,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
                }

            } catch (RemoteException e) {

                mService.set(null);

                sIsInitialized.set(false);

                sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

            }

        } finally {
@@ -658,6 +665,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
            }

        } catch (RemoteException e) {

            mService.set(null);

            sIsInitialized.set(false);

            sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

            return;

        }
@@ -686,6 +694,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
            return downloadService.getDownloadStatus(downloadRequest, fileInfo);

        } catch (RemoteException e) {

            mService.set(null);

            sIsInitialized.set(false);

            sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

            return STATUS_UNKNOWN;

        }
@@ -727,6 +736,7 @@ public class MbmsDownloadSession implements AutoCloseable { 
            }

        } catch (RemoteException e) {

            mService.set(null);

            sIsInitialized.set(false);

            sendErrorToApp(MbmsErrors.ERROR_MIDDLEWARE_LOST, null);

        }

    }