diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-11-07 10:21:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-07 10:21:34 -0800 |
| commit | 03be79b35ca7060f383075a43ff19c8a9d63a7c0 (patch) | |
| tree | 838ad704884042e15290a514c45403c518d7e7ed /core/java/android/app | |
| parent | d17f5a546bf8f610a4373bd8c74b9b74170887ac (diff) | |
| parent | fbf4888d19b0c68d8004f9ad2423a583dc01178e (diff) | |
| download | frameworks_base-03be79b35ca7060f383075a43ff19c8a9d63a7c0.zip frameworks_base-03be79b35ca7060f383075a43ff19c8a9d63a7c0.tar.gz frameworks_base-03be79b35ca7060f383075a43ff19c8a9d63a7c0.tar.bz2 | |
am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev
* commit 'fbf4888d19b0c68d8004f9ad2423a583dc01178e':
Fix issue #11223338: Not retaining service started state while restarting
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index bb04063..7ca3459 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -2272,9 +2272,12 @@ public class ActivityManager { public static void dumpPackageStateStatic(FileDescriptor fd, String packageName) { FileOutputStream fout = new FileOutputStream(fd); PrintWriter pw = new FastPrintWriter(fout); - dumpService(pw, fd, Context.ACTIVITY_SERVICE, new String[] { "package", packageName }); + dumpService(pw, fd, Context.ACTIVITY_SERVICE, new String[] { + "-a", "package", packageName }); pw.println(); - dumpService(pw, fd, ProcessStats.SERVICE_NAME, new String[] { packageName }); + dumpService(pw, fd, "meminfo", new String[] { "--local", packageName }); + pw.println(); + dumpService(pw, fd, ProcessStats.SERVICE_NAME, new String[] { "-a", packageName }); pw.println(); dumpService(pw, fd, "usagestats", new String[] { "--packages", packageName }); pw.println(); @@ -2296,7 +2299,7 @@ public class ActivityManager { pw.flush(); tp = new TransferPipe(); tp.setBufferPrefix(" "); - service.dump(tp.getWriteFd().getFileDescriptor(), args); + service.dumpAsync(tp.getWriteFd().getFileDescriptor(), args); tp.go(fd); } catch (Throwable e) { if (tp != null) { |