From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 6 Apr 2017 09:41:50 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/152373142. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217 --- .../simulator/impl/SimulatorActionProvider.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'java/com/android/dialer/simulator') diff --git a/java/com/android/dialer/simulator/impl/SimulatorActionProvider.java b/java/com/android/dialer/simulator/impl/SimulatorActionProvider.java index 4acb548a6..8257d9853 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorActionProvider.java +++ b/java/com/android/dialer/simulator/impl/SimulatorActionProvider.java @@ -21,17 +21,30 @@ import android.content.Intent; import android.os.AsyncTask; import android.provider.VoicemailContract; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.view.ActionProvider; import android.view.MenuItem; import android.view.SubMenu; import android.view.View; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.DialerExecutor.Worker; +import com.android.dialer.common.concurrent.DialerExecutors; +import com.android.dialer.persistentlog.PersistentLogger; /** Implements the simulator submenu. */ final class SimulatorActionProvider extends ActionProvider { @NonNull private final Context context; + private static class ShareLogWorker implements Worker { + + @Nullable + @Override + public String doInBackground(Void unused) { + return PersistentLogger.dumpLogToString(); + } + } + public SimulatorActionProvider(@NonNull Context context) { super(Assert.isNotNull(context)); this.context = context; @@ -82,6 +95,25 @@ final class SimulatorActionProvider extends ActionProvider { context.sendBroadcast(intent); return true; }); + + subMenu + .add("Share persistent log") + .setOnMenuItemClickListener( + (item) -> { + DialerExecutors.createNonUiTaskBuilder(new ShareLogWorker()) + .onSuccess( + (String log) -> { + Intent intent = new Intent(Intent.ACTION_SEND); + intent.setType("text/plain"); + intent.putExtra(Intent.EXTRA_TEXT, log); + if (intent.resolveActivity(context.getPackageManager()) != null) { + context.startActivity(intent); + } + }) + .build() + .executeSerial(null); + return true; + }); } private void populateDatabase() { -- cgit v1.2.3