From 734b0b716325e55700bb99e99bbb0f170edf65bc Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Fri, 11 Aug 2017 18:22:16 -0700
Subject: [PATCH] Fix and enable ConnOnActivityStartTest.

- Set parole duration to 0 so that it won't affect app standby test.
- Use a bound service to send commands to test app instead of broadcasts.
- Remove code to install/delete test app as it will be done as part of tests
  initialization.

Bug: 38432755
Test: forrest --extra_args='--class com.android.server.net.ConnOnActivityStartTest' \
      test FrameworksServicesTests
Change-Id: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
Merged-In: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
---
 services/tests/servicestests/Android.mk       |   5 +-
 services/tests/servicestests/AndroidTest.xml  |   1 +
 services/tests/servicestests/aidl/Android.mk  |   3 +-
 .../aidl/ICmdReceiverService.aidl             |  21 ++
 .../tests/servicestests/res/raw/conntestapp   | Bin 8260 -> 0 bytes
 .../server/net/ConnOnActivityStartTest.java   | 185 ++++++++----------
 .../tests/servicestests/test-apps/Android.mk  |   1 +
 .../test-apps/ConnTestApp/Android.mk          |   2 +
 .../test-apps/ConnTestApp/AndroidManifest.xml |   2 +
 .../apps/conntestapp/CmdReceiverService.java  |  36 ++++
 .../apps/conntestapp/ConnTestActivity.java    |  34 ++++
 11 files changed, 185 insertions(+), 105 deletions(-)
 create mode 100644 services/tests/servicestests/aidl/com/android/servicestests/aidl/ICmdReceiverService.aidl
 delete mode 100644 services/tests/servicestests/res/raw/conntestapp
 create mode 100644 services/tests/servicestests/test-apps/Android.mk
 create mode 100644 services/tests/servicestests/test-apps/ConnTestApp/src/com/android/servicestests/apps/conntestapp/CmdReceiverService.java

diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk
index 507b4830e455b..19396d43e15e4 100644
--- a/services/tests/servicestests/Android.mk
+++ b/services/tests/servicestests/Android.mk
@@ -29,7 +29,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 
 LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl
 
-LOCAL_SRC_FILES += aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl
+LOCAL_SRC_FILES += aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl \
+    aidl/com/android/servicestests/aidl/ICmdReceiverService.aidl
 
 LOCAL_JAVA_LIBRARIES := android.test.mock legacy-android-test
 
@@ -61,3 +62,5 @@ LOCAL_DX_FLAGS := --multi-dex
 LOCAL_STATIC_JAVA_LIBRARIES += ub-uiautomator
 
 include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))
\ No newline at end of file
diff --git a/services/tests/servicestests/AndroidTest.xml b/services/tests/servicestests/AndroidTest.xml
index 63f3b75604677..6a9983e87d903 100644
--- a/services/tests/servicestests/AndroidTest.xml
+++ b/services/tests/servicestests/AndroidTest.xml
@@ -16,6 +16,7 @@
 <configuration description="Runs Frameworks Services Tests.">
     <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
         <option name="test-file-name" value="FrameworksServicesTests.apk" />
+        <option name="test-file-name" value="ConnTestApp.apk" />
     </target_preparer>
 
     <option name="test-suite-tag" value="apct" />
diff --git a/services/tests/servicestests/aidl/Android.mk b/services/tests/servicestests/aidl/Android.mk
index 0c9b839628338..166da1dea7e3a 100644
--- a/services/tests/servicestests/aidl/Android.mk
+++ b/services/tests/servicestests/aidl/Android.mk
@@ -18,6 +18,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := \
-        com/android/servicestests/aidl/INetworkStateObserver.aidl
+        com/android/servicestests/aidl/INetworkStateObserver.aidl \
+        com/android/servicestests/aidl/ICmdReceiverService.aidl
 LOCAL_MODULE := servicestests-aidl
 include $(BUILD_STATIC_JAVA_LIBRARY)
\ No newline at end of file
diff --git a/services/tests/servicestests/aidl/com/android/servicestests/aidl/ICmdReceiverService.aidl b/services/tests/servicestests/aidl/com/android/servicestests/aidl/ICmdReceiverService.aidl
new file mode 100644
index 0000000000000..d96450478f90d
--- /dev/null
+++ b/services/tests/servicestests/aidl/com/android/servicestests/aidl/ICmdReceiverService.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2017 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.servicestests.aidl;
+
+interface ICmdReceiverService {
+    void finishActivity();
+}
\ No newline at end of file
diff --git a/services/tests/servicestests/res/raw/conntestapp b/services/tests/servicestests/res/raw/conntestapp
deleted file mode 100644
index e99316446f7e8d5613fc13da3355419bf9b9c8b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8260
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

diff --git a/services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java b/services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
index 5b4c10f11af8b..7f48b8e1759ad 100644
--- a/services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
+++ b/services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
@@ -16,48 +16,37 @@
 
 package com.android.server.net;
 
-import static android.util.DebugUtils.valueToString;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.android.frameworks.servicestests.R;
+import com.android.servicestests.aidl.ICmdReceiverService;
 import com.android.servicestests.aidl.INetworkStateObserver;
 
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.IntentSender;
-import android.content.pm.IPackageDeleteObserver;
-import android.content.pm.PackageInstaller;
+import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.BatteryManager;
 import android.os.Bundle;
-import android.os.RemoteException;
+import android.os.IBinder;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.LargeTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.UiDevice;
 import android.util.Log;
 
-import libcore.io.IoUtils;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -76,62 +65,118 @@ import java.util.concurrent.TimeUnit;
  * Run: adb shell am instrument -e class com.android.server.net.ConnOnActivityStartTest -w \
  *     com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
  */
-@Ignore
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class ConnOnActivityStartTest {
     private static final String TAG = ConnOnActivityStartTest.class.getSimpleName();
 
-    private static final String ACTION_INSTALL_COMPLETE = "com.android.server.net.INSTALL_COMPLETE";
-
-    private static final String TEST_APP_URI =
-            "android.resource://com.android.frameworks.servicestests/raw/conntestapp";
     private static final String TEST_PKG = "com.android.servicestests.apps.conntestapp";
     private static final String TEST_ACTIVITY_CLASS = TEST_PKG + ".ConnTestActivity";
-
-    private static final String ACTION_FINISH_ACTIVITY = TEST_PKG + ".FINISH";
+    private static final String TEST_SERVICE_CLASS = TEST_PKG + ".CmdReceiverService";
 
     private static final String EXTRA_NETWORK_STATE_OBSERVER = TEST_PKG + ".observer";
 
     private static final long BATTERY_OFF_TIMEOUT_MS = 2000; // 2 sec
     private static final long BATTERY_OFF_CHECK_INTERVAL_MS = 200; // 0.2 sec
 
-    private static final long WAIT_FOR_INSTALL_TIMEOUT_MS = 2000; // 2 sec
-
     private static final long NETWORK_CHECK_TIMEOUT_MS = 4000; // 4 sec
 
     private static final long SCREEN_ON_DELAY_MS = 500; // 0.5 sec
 
+    private static final long BIND_SERVICE_TIMEOUT_SEC = 4;
+
     private static final int REPEAT_TEST_COUNT = 5;
 
+    private static final String KEY_PAROLE_DURATION = "parole_duration";
+    private static final String DESIRED_PAROLE_DURATION = "0";
+
     private static Context mContext;
     private static UiDevice mUiDevice;
     private static int mTestPkgUid;
     private static BatteryManager mBatteryManager;
 
+    private static boolean mAppIdleConstsUpdated;
+    private static String mOriginalAppIdleConsts;
+
+    private static ServiceConnection mServiceConnection;
+    private static ICmdReceiverService mCmdReceiverService;
+
     @BeforeClass
     public static void setUpOnce() throws Exception {
         mContext = InstrumentationRegistry.getContext();
         mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
 
-        installAppAndAssertInstalled();
+        setDesiredParoleDuration();
         mContext.getPackageManager().setApplicationEnabledSetting(TEST_PKG,
                 PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
         mTestPkgUid = mContext.getPackageManager().getPackageUid(TEST_PKG, 0);
 
         mBatteryManager = (BatteryManager) mContext.getSystemService(Context.BATTERY_SERVICE);
+        bindService();
     }
 
     @AfterClass
     public static void tearDownOnce() {
-        mContext.getPackageManager().deletePackage(TEST_PKG,
-                new IPackageDeleteObserver.Stub() {
-                    @Override
-                    public void packageDeleted(String packageName, int returnCode)
-                            throws RemoteException {
-                        Log.e(TAG, packageName + " deleted, returnCode: " + returnCode);
-                    }
-                }, 0);
+        if (mAppIdleConstsUpdated) {
+            Settings.Global.putString(mContext.getContentResolver(),
+                    Settings.Global.APP_IDLE_CONSTANTS, mOriginalAppIdleConsts);
+        }
+        unbindService();
+    }
+
+    private static void bindService() throws Exception {
+        final CountDownLatch bindLatch = new CountDownLatch(1);
+        mServiceConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                Log.i(TAG, "Service connected");
+                mCmdReceiverService = ICmdReceiverService.Stub.asInterface(service);
+                bindLatch.countDown();
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                Log.i(TAG, "Service disconnected");
+            }
+        };
+        final Intent intent = new Intent()
+                .setComponent(new ComponentName(TEST_PKG, TEST_SERVICE_CLASS));
+        // Needs to use BIND_ALLOW_OOM_MANAGEMENT and BIND_NOT_FOREGROUND so that the test app
+        // does not run in the same process state as this app.
+        mContext.bindService(intent, mServiceConnection,
+                Context.BIND_AUTO_CREATE
+                        | Context.BIND_ALLOW_OOM_MANAGEMENT
+                        | Context.BIND_NOT_FOREGROUND);
+        if (!bindLatch.await(BIND_SERVICE_TIMEOUT_SEC, TimeUnit.SECONDS)) {
+            fail("Timed out waiting for the service to bind in " + mTestPkgUid);
+        }
+    }
+
+    private static void unbindService() {
+        if (mCmdReceiverService != null) {
+            mContext.unbindService(mServiceConnection);
+        }
+    }
+
+    private static void setDesiredParoleDuration() {
+        mOriginalAppIdleConsts = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.APP_IDLE_CONSTANTS);
+        String newAppIdleConstants;
+        final String newConstant = KEY_PAROLE_DURATION + "=" + DESIRED_PAROLE_DURATION;
+        if (mOriginalAppIdleConsts == null || "null".equals(mOriginalAppIdleConsts)) {
+            // app_idle_constants is initially empty, so just assign the desired value.
+            newAppIdleConstants = newConstant;
+        } else if (mOriginalAppIdleConsts.contains(KEY_PAROLE_DURATION)) {
+            // app_idle_constants contains parole_duration, so replace it with the desired value.
+            newAppIdleConstants = mOriginalAppIdleConsts.replaceAll(
+                    KEY_PAROLE_DURATION + "=\\d+", newConstant);
+        } else {
+            // app_idle_constants didn't have parole_duration, so append the desired value.
+            newAppIdleConstants = mOriginalAppIdleConsts + "," + newConstant;
+        }
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.APP_IDLE_CONSTANTS, newAppIdleConstants);
+        mAppIdleConstsUpdated = true;
     }
 
     @Test
@@ -174,6 +219,7 @@ public class ConnOnActivityStartTest {
             startActivityAndCheckNetworkAccess();
         } finally {
             turnBatteryOn();
+            finishActivity();
             setAppIdle(false);
         }
     }
@@ -195,9 +241,9 @@ public class ConnOnActivityStartTest {
                 turnScreenOn();
                 SystemClock.sleep(SCREEN_ON_DELAY_MS);
                 startActivityAndCheckNetworkAccess();
-                Log.d(TAG, testName + " end #" + i);
             } finally {
                 finishActivity();
+                Log.d(TAG, testName + " end #" + i);
             }
         }
     }
@@ -348,74 +394,7 @@ public class ConnOnActivityStartTest {
         }
     }
 
-    private void finishActivity() {
-        final Intent finishIntent = new Intent(ACTION_FINISH_ACTIVITY)
-                .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
-        mContext.sendBroadcast(finishIntent);
-    }
-    private static void installAppAndAssertInstalled() throws Exception {
-        final CountDownLatch latch = new CountDownLatch(1);
-        final int[] result = {PackageInstaller.STATUS_SUCCESS};
-        final BroadcastReceiver installStatusReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                final String pkgName = intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME);
-                if (!TEST_PKG.equals(pkgName)) {
-                    return;
-                }
-                result[0] = intent.getIntExtra(PackageInstaller.EXTRA_STATUS,
-                        PackageInstaller.STATUS_FAILURE);
-                latch.countDown();
-            }
-        };
-        mContext.registerReceiver(installStatusReceiver, new IntentFilter(ACTION_INSTALL_COMPLETE));
-        try {
-            installApp();
-            if (latch.await(WAIT_FOR_INSTALL_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
-                if (result[0] != PackageInstaller.STATUS_SUCCESS) {
-                    fail("Couldn't install test app, result: "
-                            + valueToString(PackageInstaller.class, "STATUS_", result[0]));
-                }
-            } else {
-                fail("Timed out waiting for the test app to install");
-            }
-        } finally {
-            mContext.unregisterReceiver(installStatusReceiver);
-        }
-    }
-
-    private static void installApp() throws Exception {
-        final Uri packageUri = Uri.parse(TEST_APP_URI);
-        final InputStream in = mContext.getContentResolver().openInputStream(packageUri);
-
-        final PackageInstaller packageInstaller
-                = mContext.getPackageManager().getPackageInstaller();
-        final PackageInstaller.SessionParams params = new PackageInstaller.SessionParams(
-                PackageInstaller.SessionParams.MODE_FULL_INSTALL);
-        params.setAppPackageName(TEST_PKG);
-
-        final int sessionId = packageInstaller.createSession(params);
-        final PackageInstaller.Session session = packageInstaller.openSession(sessionId);
-
-        OutputStream out = null;
-        try {
-            out = session.openWrite(TAG, 0, -1);
-            final byte[] buffer = new byte[65536];
-            int c;
-            while ((c = in.read(buffer)) != -1) {
-                out.write(buffer, 0, c);
-            }
-            session.fsync(out);
-        } finally {
-            IoUtils.closeQuietly(in);
-            IoUtils.closeQuietly(out);
-        }
-        session.commit(createIntentSender(mContext, sessionId));
-    }
-
-    private static IntentSender createIntentSender(Context context, int sessionId) {
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(
-                context, sessionId, new Intent(ACTION_INSTALL_COMPLETE), 0);
-        return pendingIntent.getIntentSender();
+    private void finishActivity() throws Exception {
+        mCmdReceiverService.finishActivity();
     }
 }
\ No newline at end of file
diff --git a/services/tests/servicestests/test-apps/Android.mk b/services/tests/servicestests/test-apps/Android.mk
new file mode 100644
index 0000000000000..5053e7d64389d
--- /dev/null
+++ b/services/tests/servicestests/test-apps/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)
diff --git a/services/tests/servicestests/test-apps/ConnTestApp/Android.mk b/services/tests/servicestests/test-apps/ConnTestApp/Android.mk
index 030a709b0215b..fbfa28a9e93b6 100644
--- a/services/tests/servicestests/test-apps/ConnTestApp/Android.mk
+++ b/services/tests/servicestests/test-apps/ConnTestApp/Android.mk
@@ -18,6 +18,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := tests
 
+LOCAL_COMPATIBILITY_SUITE := device-tests
+
 LOCAL_STATIC_JAVA_LIBRARIES := servicestests-aidl
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
diff --git a/services/tests/servicestests/test-apps/ConnTestApp/AndroidManifest.xml b/services/tests/servicestests/test-apps/ConnTestApp/AndroidManifest.xml
index 66714109a761a..909e9bb7bcd9e 100644
--- a/services/tests/servicestests/test-apps/ConnTestApp/AndroidManifest.xml
+++ b/services/tests/servicestests/test-apps/ConnTestApp/AndroidManifest.xml
@@ -24,6 +24,8 @@
     <application>
         <activity android:name=".ConnTestActivity"
                   android:exported="true" />
+        <service android:name=".CmdReceiverService"
+                 android:exported="true" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/services/tests/servicestests/test-apps/ConnTestApp/src/com/android/servicestests/apps/conntestapp/CmdReceiverService.java b/services/tests/servicestests/test-apps/ConnTestApp/src/com/android/servicestests/apps/conntestapp/CmdReceiverService.java
new file mode 100644
index 0000000000000..6130f3a3fc76d
--- /dev/null
+++ b/services/tests/servicestests/test-apps/ConnTestApp/src/com/android/servicestests/apps/conntestapp/CmdReceiverService.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 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.servicestests.apps.conntestapp;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+import com.android.servicestests.aidl.ICmdReceiverService;
+
+public class CmdReceiverService extends Service {
+    private ICmdReceiverService.Stub mBinder = new ICmdReceiverService.Stub() {
+        @Override
+        public void finishActivity() {
+            ConnTestActivity.finishSelf();
+        }
+    };
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+}
\ No newline at end of file
diff --git a/services/tests/servicestests/test-apps/ConnTestApp/src/com/android/servicestests/apps/conntestapp/ConnTestActivity.java b/services/tests/servicestests/test-apps/ConnTestApp/src/com/android/servicestests/apps/conntestapp/ConnTestActivity.java
index c5c7add29f936..b26cc7fd0130e 100644
--- a/services/tests/servicestests/test-apps/ConnTestApp/src/com/android/servicestests/apps/conntestapp/ConnTestActivity.java
+++ b/services/tests/servicestests/test-apps/ConnTestApp/src/com/android/servicestests/apps/conntestapp/ConnTestActivity.java
@@ -30,6 +30,7 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.util.Log;
 
+import com.android.internal.annotations.GuardedBy;
 import com.android.servicestests.aidl.INetworkStateObserver;
 
 public class ConnTestActivity extends Activity {
@@ -39,31 +40,64 @@ public class ConnTestActivity extends Activity {
     private static final String ACTION_FINISH_ACTIVITY = TEST_PKG + ".FINISH";
     private static final String EXTRA_NETWORK_STATE_OBSERVER = TEST_PKG + ".observer";
 
+    private static final Object INSTANCE_LOCK = new Object();
+    @GuardedBy("instanceLock")
+    private static Activity sInstance;
+
     private BroadcastReceiver finishCommandReceiver = null;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        synchronized (INSTANCE_LOCK) {
+            sInstance = this;
+        }
+        Log.i(TAG, "onCreate called");
 
         notifyNetworkStateObserver();
 
         finishCommandReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
+                Log.i(TAG, "finish command received");
                 ConnTestActivity.this.finish();
             }
         };
         registerReceiver(finishCommandReceiver, new IntentFilter(ACTION_FINISH_ACTIVITY));
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        Log.i(TAG, "onResume called");
+    }
+
     @Override
     public void onStop() {
+        Log.i(TAG, "onStop called");
         if (finishCommandReceiver != null) {
             unregisterReceiver(finishCommandReceiver);
         }
         super.onStop();
     }
 
+    @Override
+    public void finish() {
+        synchronized (INSTANCE_LOCK) {
+            sInstance = null;
+        }
+        Log.i(TAG, "finish called");
+        super.finish();
+    }
+
+    public static void finishSelf() {
+        synchronized (INSTANCE_LOCK) {
+            if (sInstance != null) {
+                sInstance.finish();
+            }
+        }
+    }
+
     private void notifyNetworkStateObserver() {
         if (getIntent() == null) {
             return;