Skip to content

Commit

Permalink
CHG: [droid] handle initial intent via OnNewIntent
Browse files Browse the repository at this point in the history
  • Loading branch information
koying committed Jan 26, 2018
1 parent 492cb86 commit 6472c1b
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions tools/android/packaging/xbmc/src/Main.java.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ package @APP_PACKAGE@;
import android.app.AlarmManager;
import android.app.AlertDialog;
import android.app.PendingIntent;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.net.Uri;
import android.os.Build.VERSION_CODES;
import android.os.Build;
import android.app.NativeActivity;
Expand All @@ -32,16 +30,11 @@ import android.view.Gravity;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;

import @APP_PACKAGE@.channels.model.Subscription;
import @APP_PACKAGE@.channels.model.XBMCDatabase;
import @APP_PACKAGE@.channels.util.TvUtil;
import @APP_PACKAGE@.content.XBMCFileContentProvider;
import @APP_PACKAGE@.interfaces.XBMCInputDeviceListener;

import java.text.MessageFormat;
import java.util.Arrays;
import java.util.List;

public class Main extends NativeActivity implements Choreographer.FrameCallback
{
Expand Down Expand Up @@ -250,8 +243,6 @@ public class Main extends NativeActivity implements Choreographer.FrameCallback

public void startCapture(int width, int height)
{
if (mMediaProjection == null)
return;
mCaptureProjection.startCapture(width, height);
}

Expand Down Expand Up @@ -309,9 +300,6 @@ public class Main extends NativeActivity implements Choreographer.FrameCallback
getIntent().setData(null);
}

// keep alive
startService(new Intent(this, KeepAliveService.class));

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
{
AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
Expand Down

0 comments on commit 6472c1b

Please sign in to comment.