Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: shell/android/apk/src/org/chromium/mojo/shell/SharingActivity.java

Issue 1431663002: Update android SDK to API version 23. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Folloe review Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: shell/android/apk/src/org/chromium/mojo/shell/SharingActivity.java
diff --git a/shell/android/apk/src/org/chromium/mojo/shell/SharingActivity.java b/shell/android/apk/src/org/chromium/mojo/shell/SharingActivity.java
index 5b06eac75a0cf6bcc333c38ee942c5b452b03a4e..fcaedce8cd22853dd09800792ec4ff58695a3c45 100644
--- a/shell/android/apk/src/org/chromium/mojo/shell/SharingActivity.java
+++ b/shell/android/apk/src/org/chromium/mojo/shell/SharingActivity.java
@@ -4,11 +4,9 @@
package org.chromium.mojo.shell;
-import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
-import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -21,17 +19,19 @@ import java.util.ArrayDeque;
/**
* Activity for sharing data with shell apps.
*/
-public final class SharingActivity extends Activity implements ShellService.IShellBindingActivity {
+public final class SharingActivity
+ extends BaseActivity implements ShellService.IShellBindingActivity {
private static final String TAG = "SharingActivity";
private ArrayDeque<Intent> mPendingIntents = new ArrayDeque<Intent>();
private ShellService mShellService;
private ServiceConnection mShellServiceConnection;
+ /**
+ * @see BaseActivity#onCreateWithPermissions()
+ */
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
+ void onCreateWithPermissions() {
Intent serviceIntent = new Intent(this, ShellService.class);
startService(serviceIntent);
mShellServiceConnection = new ShellService.ShellServiceConnection(this);
« no previous file with comments | « shell/android/apk/src/org/chromium/mojo/shell/NfcReceiverActivity.java ('k') | tools/android/README_android_tools.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698