Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94e122bf authored by Mangesh Ghiware's avatar Mangesh Ghiware
Browse files

Use the same taskAffinity for trampoline as Camera

Bug: 10842131
Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f
parent 9029a469
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -177,9 +177,9 @@
        <activity android:name="com.android.camera.CameraActivity"
            android:icon="@mipmap/ic_launcher_camera"
            android:label="@string/camera_label"
            android:taskAffinity="com.android.camera.CameraActivity"
            android:theme="@style/android:Theme.NoDisplay" />
        <activity-alias android:name="com.android.camera.CameraLauncher"
            android:excludeFromRecents="true"
            android:label="@string/camera_label"
            android:targetActivity="com.android.camera.CameraActivity">
            <intent-filter>
+4 −1
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ public class CameraActivity extends Activity {
    public void onCreate(Bundle icicle) {
        super.onCreate(icicle);
        Intent intent = CameraHelper.CAMERA_LAUNCHER_INTENT;
        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
        // Since this is being launched from a homescreen shorcut,
        // it's already in a new task. Start Camera activity and
        // reset the task to its initial state if needed.
        intent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
        startActivity(intent);
        finish();
    }