Catch exceptions from starting/started activities
- Catches ActivityNotFoundException and SecurityException
- Adds intermediary activity for suppressing crashes
Bug: 126568571
Test: manual
Change-Id: I08b78cb4659c1614561402dea9449263b177d062
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 53c0d3f..83c29c2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -45,6 +45,10 @@
</activity>
<activity
+ android:name=".activity.ActivityStarterActivity"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"/>
+
+ <activity
android:name=".activity.ArtistDetailsActivity"
android:screenOrientation="portrait"/>
diff --git a/java/com/android/pump/activity/ActivityStarterActivity.java b/java/com/android/pump/activity/ActivityStarterActivity.java
new file mode 100644
index 0000000..ff8cda3
--- /dev/null
+++ b/java/com/android/pump/activity/ActivityStarterActivity.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.pump.activity;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+
+import com.android.pump.util.Clog;
+
+@UiThread
+// This class needs to inherit from Activity in order for Theme.Translucent to be applied correctly.
+public class ActivityStarterActivity extends /* NOT AppCompatActivity !!! */ Activity {
+ private static final String TAG = Clog.tag(ActivityStarterActivity.class);
+
+ private static final int REQUEST_CODE = 42;
+ private static final String EXTRA_INTENT =
+ "com.android.pump.activity.ActivityStarterActivity.EXTRA_INTENT";
+ private static final String EXTRA_OPTIONS =
+ "com.android.pump.activity.ActivityStarterActivity.EXTRA_OPTIONS";
+
+ private boolean mApplicationCrashed;
+
+ public static @NonNull Intent createStartIntent(@NonNull Context context,
+ @NonNull Intent intent, @Nullable Bundle options) {
+ Intent wrapperIntent = new Intent(context, ActivityStarterActivity.class);
+ wrapperIntent.putExtra(EXTRA_INTENT, intent);
+ wrapperIntent.putExtra(EXTRA_OPTIONS, options);
+ return wrapperIntent;
+ }
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ if (savedInstanceState != null) {
+ // We're already waiting for the activity to finish, so don't start another instance.
+ mApplicationCrashed = true;
+ return;
+ }
+
+ Intent intent = getIntent();
+ Intent startIntent = getExtraIntent(intent);
+ if (startIntent != null) {
+ try {
+ Bundle options = intent.getParcelableExtra(EXTRA_OPTIONS);
+ startActivityForResult(startIntent, REQUEST_CODE, options);
+ mApplicationCrashed = true;
+ } catch (ActivityNotFoundException e) {
+ Clog.w(TAG, "Failed to find activity for intent " + startIntent, e);
+
+ // TODO(b/123037263) I18n -- Move to resource
+ cancel("Failed to find application");
+ } catch (SecurityException e) {
+ Clog.w(TAG, "No permission to launch intent " + startIntent, e);
+
+ // TODO(b/123037263) I18n -- Move to resource
+ cancel("No permission to launch application");
+ }
+ } else {
+ throw new IllegalArgumentException(
+ "Couldn't find EXTRA_INTENT for activity starter activity");
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ if (!isFinishing()) {
+ // The system is temporarily killing us, so ignore for now.
+ return;
+ }
+
+ if (mApplicationCrashed) {
+ Clog.w(TAG, "Activity crashed for intent " + getExtraIntent(getIntent()));
+
+ // TODO(b/123037263) I18n -- Move to resource
+ Toast.makeText(this, "Tried to start an external application but it crashed.",
+ Toast.LENGTH_SHORT).show();
+ }
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == REQUEST_CODE) {
+ mApplicationCrashed = false;
+ setResult(resultCode, data);
+ finish();
+ } else {
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+ }
+
+ private @Nullable Intent getExtraIntent(@Nullable Intent intent) {
+ return intent == null ? null : intent.getParcelableExtra(EXTRA_INTENT);
+ }
+
+ private void cancel(@NonNull CharSequence message) {
+ Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+ setResult(Activity.RESULT_CANCELED);
+ finish();
+ }
+}
diff --git a/java/com/android/pump/activity/AudioPlayerActivity.java b/java/com/android/pump/activity/AudioPlayerActivity.java
index be3f5fb..fe1fd5f 100644
--- a/java/com/android/pump/activity/AudioPlayerActivity.java
+++ b/java/com/android/pump/activity/AudioPlayerActivity.java
@@ -37,6 +37,7 @@
import com.android.pump.db.Genre;
import com.android.pump.db.Playlist;
import com.android.pump.util.Clog;
+import com.android.pump.util.IntentUtils;
@UiThread
public class AudioPlayerActivity extends AppCompatActivity {
@@ -51,7 +52,7 @@
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
intent.setDataAndTypeAndNormalize(uri, audio.getMimeType());
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- context.startActivity(intent);
+ IntentUtils.startExternalActivity(context, intent);
}
public static void start(@NonNull Context context, @NonNull Album album) {
@@ -62,7 +63,7 @@
// TODO Should the mime type be MediaStore.Audio.Albums.ENTRY_CONTENT_TYPE?
intent.setDataAndTypeAndNormalize(uri, MediaStore.Audio.Albums.CONTENT_TYPE);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- context.startActivity(intent);
+ IntentUtils.startExternalActivity(context, intent);
}
public static void start(@NonNull Context context, @NonNull Artist artist) {
@@ -73,7 +74,7 @@
// TODO Should the mime type be MediaStore.Audio.Artists.ENTRY_CONTENT_TYPE?
intent.setDataAndTypeAndNormalize(uri, MediaStore.Audio.Artists.CONTENT_TYPE);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- context.startActivity(intent);
+ IntentUtils.startExternalActivity(context, intent);
}
public static void start(@NonNull Context context, @NonNull Genre genre) {
@@ -84,7 +85,7 @@
// TODO Should the mime type be MediaStore.Audio.Genres.ENTRY_CONTENT_TYPE?
intent.setDataAndTypeAndNormalize(uri, MediaStore.Audio.Genres.CONTENT_TYPE);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- context.startActivity(intent);
+ IntentUtils.startExternalActivity(context, intent);
}
public static void start(@NonNull Context context, @NonNull Playlist playlist) {
@@ -95,7 +96,7 @@
// TODO Should the mime type be MediaStore.Audio.Playlists.ENTRY_CONTENT_TYPE?
intent.setDataAndTypeAndNormalize(uri, MediaStore.Audio.Playlists.CONTENT_TYPE);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- context.startActivity(intent);
+ IntentUtils.startExternalActivity(context, intent);
}
public static void start(@NonNull Context context, @NonNull Playlist playlist, int position) {
@@ -108,7 +109,7 @@
// TODO Should the mime type be MediaStore.Audio.Playlists.CONTENT_TYPE?
intent.setDataAndTypeAndNormalize(uri, MediaStore.Audio.Playlists.ENTRY_CONTENT_TYPE);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- context.startActivity(intent);
+ IntentUtils.startExternalActivity(context, intent);
}
@Override
diff --git a/java/com/android/pump/activity/VideoPlayerActivity.java b/java/com/android/pump/activity/VideoPlayerActivity.java
index 781169c..5ba7ce8 100644
--- a/java/com/android/pump/activity/VideoPlayerActivity.java
+++ b/java/com/android/pump/activity/VideoPlayerActivity.java
@@ -38,6 +38,7 @@
import com.android.pump.concurrent.Executors;
import com.android.pump.db.Video;
import com.android.pump.util.Clog;
+import com.android.pump.util.IntentUtils;
@UiThread
public class VideoPlayerActivity extends AppCompatActivity {
@@ -55,7 +56,7 @@
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
intent.setDataAndTypeAndNormalize(uri, video.getMimeType());
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- context.startActivity(intent);
+ IntentUtils.startExternalActivity(context, intent);
}
@Override
diff --git a/java/com/android/pump/fragment/PermissionFragment.java b/java/com/android/pump/fragment/PermissionFragment.java
index bc7e8a0..9d7dbbf 100644
--- a/java/com/android/pump/fragment/PermissionFragment.java
+++ b/java/com/android/pump/fragment/PermissionFragment.java
@@ -34,6 +34,7 @@
import com.android.pump.R;
import com.android.pump.activity.PumpActivity;
+import com.android.pump.util.IntentUtils;
import java.util.Collection;
import java.util.HashSet;
@@ -86,7 +87,7 @@
// system permission settings for this package.
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
intent.setData(Uri.fromParts("package", requireActivity().getPackageName(), null));
- startActivity(intent);
+ IntentUtils.startExternalActivity(requireContext(), intent);
}
} else {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
diff --git a/java/com/android/pump/util/IntentUtils.java b/java/com/android/pump/util/IntentUtils.java
new file mode 100644
index 0000000..d853ea9
--- /dev/null
+++ b/java/com/android/pump/util/IntentUtils.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.pump.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.fragment.app.Fragment;
+
+import com.android.pump.activity.ActivityStarterActivity;
+
+@UiThread
+public final class IntentUtils {
+ private IntentUtils() { }
+
+ public static void startExternalActivity(@NonNull Context context, @NonNull Intent intent) {
+ startExternalActivity(context, intent, null);
+ }
+
+ public static void startExternalActivity(@NonNull Context context, @NonNull Intent intent,
+ @Nullable Bundle options) {
+ Intent startIntent = ActivityStarterActivity.createStartIntent(context, intent, options);
+ context.startActivity(startIntent);
+ }
+
+ public static void startExternalActivityForResult(@NonNull Activity activity,
+ @NonNull Intent intent, int requestCode) {
+ startExternalActivityForResult(activity, intent, requestCode, null);
+ }
+
+ public static void startExternalActivityForResult(@NonNull Activity activity,
+ @NonNull Intent intent, int requestCode, @Nullable Bundle options) {
+ Intent startIntent = ActivityStarterActivity.createStartIntent(activity, intent, options);
+ activity.startActivityForResult(startIntent, requestCode);
+ }
+
+ public static void startExternalActivityForResult(@NonNull Fragment fragment,
+ @NonNull Intent intent, int requestCode) {
+ startExternalActivityForResult(fragment, intent, requestCode, null);
+ }
+
+ public static void startExternalActivityForResult(@NonNull Fragment fragment,
+ @NonNull Intent intent, int requestCode, @Nullable Bundle options) {
+ Context context = fragment.requireContext();
+ Intent startIntent = ActivityStarterActivity.createStartIntent(context, intent, options);
+ fragment.startActivityForResult(startIntent, requestCode);
+ }
+}
