Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e2be3416: Merge "Don\'t call broken+deprecated SamplingProfiler.writeHprofData" into honeycomb

Browse Source 
* commit 'e2be3416f2851a5bc482ad103c771f212e88ef20':
  Don't call broken+deprecated SamplingProfiler.writeHprofData
This commit is contained in:
Jesse Wilson
2011-01-23 16:42:58 -08:00
committed by Android Git Automerger
parent 65cd377a9f e2be3416f2
commit 9fa533c26e
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/com/android/internal/os/SamplingProfilerIntegration.java
View File

@@ -16,22 +16,21 @@
package com.android.internal.os; package com.android.internal.os;
import android.content.pm.PackageInfo;
import android.os.Build;
import android.os.SystemProperties;
import android.util.Log;
import dalvik.system.SamplingProfiler; import dalvik.system.SamplingProfiler;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicBoolean;
import android.content.pm.PackageInfo; import libcore.io.IoUtils;
import android.util.Log;
import android.os.*;
/** /**
* Integrates the framework with Dalvik's sampling profiler. * Integrates the framework with Dalvik's sampling profiler.
@@ -162,19 +161,16 @@ public class SamplingProfilerIntegration {
PrintStream out = null; PrintStream out = null;
try { try {
out = new PrintStream(new BufferedOutputStream(new FileOutputStream(path))); out = new PrintStream(new BufferedOutputStream(new FileOutputStream(path)));
} catch (IOException e) {
Log.e(TAG, "Could not open " + path + ":" + e);
return;
}
try {
generateSnapshotHeader(name, packageInfo, out); generateSnapshotHeader(name, packageInfo, out);
INSTANCE.writeHprofData(out); new SamplingProfiler.AsciiHprofWriter(INSTANCE.getHprofData(), out).write();
} finally { if (out.checkError()) {
out.close(); throw new IOException();
} }
if (out.checkError()) { } catch (IOException e) {
Log.e(TAG, "Error writing snapshot."); Log.e(TAG, "Error writing snapshot to " + path, e);
return; return;
} finally {
IoUtils.closeQuietly(out);
} }
// set file readable to the world so that SamplingProfilerService // set file readable to the world so that SamplingProfilerService
// can put it to dropbox // can put it to dropbox