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

Commit 91934a3b authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 19c549fc: am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck...

am 19c549fc: am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full."

* commit '19c549fc':
  Prevent system server dump stuck by pipe buffer full.
parents cb4a489f 19c549fc
Loading
Loading
Loading
Loading
+17 −2
Original line number Original line Diff line number Diff line
@@ -1079,14 +1079,29 @@ public final class ActivityThread {
            WindowManagerGlobal.getInstance().dumpGfxInfo(fd);
            WindowManagerGlobal.getInstance().dumpGfxInfo(fd);
        }
        }


        @Override
        private void dumpDatabaseInfo(FileDescriptor fd, String[] args) {
        public void dumpDbInfo(FileDescriptor fd, String[] args) {
            PrintWriter pw = new FastPrintWriter(new FileOutputStream(fd));
            PrintWriter pw = new FastPrintWriter(new FileOutputStream(fd));
            PrintWriterPrinter printer = new PrintWriterPrinter(pw);
            PrintWriterPrinter printer = new PrintWriterPrinter(pw);
            SQLiteDebug.dump(printer, args);
            SQLiteDebug.dump(printer, args);
            pw.flush();
            pw.flush();
        }
        }


        @Override
        public void dumpDbInfo(final FileDescriptor fd, final String[] args) {
            if (mSystemThread) {
                // Ensure this invocation is asynchronous to prevent
                // writer waiting due to buffer cannot be consumed.
                AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {
                    @Override
                    public void run() {
                        dumpDatabaseInfo(fd, args);
                    }
                });
            } else {
                dumpDatabaseInfo(fd, args);
            }
        }

        @Override
        @Override
        public void unstableProviderDied(IBinder provider) {
        public void unstableProviderDied(IBinder provider) {
            sendMessage(H.UNSTABLE_PROVIDER_DIED, provider);
            sendMessage(H.UNSTABLE_PROVIDER_DIED, provider);