Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release

Bug: 112104996
Change-Id: Iec32f622f0bb1bc1583aefcbf6d115ad05baa693

1 files changed, 9 insertions, 29 deletions

diff --git a/src/com/android/tv/LauncherActivity.java b/src/com/android/tv/LauncherActivity.java
index e03952da..679d612d 100644
--- a/src/com/android/tv/LauncherActivity.java
+++ b/src/com/android/tv/LauncherActivity.java
@@ -26,8 +26,8 @@ import android.util.Log;
 /**
  * An activity to launch a new activity.
  *
- * <p>In the case when {@link MainActivity} starts a new activity using
- * {@link Activity#startActivity} or {@link Activity#startActivityForResult}, Live TV app is
+ * <p>In the case when {@link MainActivity} starts a new activity using {@link
+ * Activity#startActivity} or {@link Activity#startActivityForResult}, Live TV app is
  * terminated if the new activity crashes. That's because the {@link android.app.ActivityManager}
  * terminates the activity which is just below the crashed activity in the activity stack. To avoid
  * this, we need to locate an additional activity between these activities in the activity stack.
@@ -35,8 +35,7 @@ import android.util.Log;
 public class LauncherActivity extends Activity {
     private static final String TAG = "LauncherActivity";
 
-    public static final String ERROR_MESSAGE
-            = "com.android.tv.LauncherActivity.ErrorMessage";
+    public static final String ERROR_MESSAGE = "com.android.tv.LauncherActivity.ErrorMessage";
 
     private static final int REQUEST_CODE_DEFAULT = 0;
     private static final int REQUEST_START_ACTIVITY = 100;
@@ -45,34 +44,16 @@ public class LauncherActivity extends Activity {
     private static final String EXTRA_REQUEST_RESULT =
             "com.android.tv.LauncherActivity.REQUEST_RESULT";
 
-    /**
-     * Starts an activity by calling {@link Activity#startActivity}.
-     */
+    /** Starts an activity by calling {@link Activity#startActivity}. */
     public static void startActivitySafe(Activity baseActivity, Intent intentToLaunch) {
         // To avoid the app termination when the new activity crashes, LauncherActivity should be
         // started by calling startActivityForResult().
-        baseActivity.startActivityForResult(createIntent(baseActivity, intentToLaunch, false),
-                REQUEST_CODE_DEFAULT);
+        baseActivity.startActivityForResult(
+                createIntent(baseActivity, intentToLaunch, false), REQUEST_CODE_DEFAULT);
     }
 
-    /**
-     * Starts an activity by calling {@link Activity#startActivityForResult}.
-     *
-     * <p>Note: {@code requestCode} should not be 0. The value is reserved for internal use.
-     */
-    public static void startActivityForResultSafe(Activity baseActivity, Intent intentToLaunch,
-            int requestCode) {
-        if (requestCode == REQUEST_CODE_DEFAULT) {
-            throw new IllegalArgumentException("requestCode should not be 0.");
-        }
-        // To avoid the app termination when the new activity crashes, LauncherActivity should be
-        // started by calling startActivityForResult().
-        baseActivity.startActivityForResult(createIntent(baseActivity, intentToLaunch, true),
-                requestCode);
-    }
-
-    private static Intent createIntent(Context context, Intent intentToLaunch,
-            boolean requestResult) {
+    private static Intent createIntent(
+            Context context, Intent intentToLaunch, boolean requestResult) {
         Intent intent = new Intent(context, LauncherActivity.class);
         intent.putExtra(EXTRA_INTENT, intentToLaunch);
         if (requestResult) {
@@ -98,8 +79,7 @@ public class LauncherActivity extends Activity {
             }
         } catch (ActivityNotFoundException e) {
             Log.w(TAG, "Activity not found for " + intent);
-            intent.putExtra(ERROR_MESSAGE,
-                    getResources().getString(R.string.msg_missing_app));
+            intent.putExtra(ERROR_MESSAGE, getResources().getString(R.string.msg_missing_app));
             setResult(Activity.RESULT_CANCELED, intent);
             finish();
         }