From c2c2e3eeb923373278fce9ef44efda58104b1164 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Wed, 2 Dec 2015 16:17:58 +0000
Subject: [PATCH] Create Vpn ManageDialog in onCreate, not onResume

Bug: 25786112
Change-Id: I3dc2ccdce4cc9b449968ab59d1e1d0ff0476ecec
---
 packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
index 76b234694790..2fe6648d82da 100644
--- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
+++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
@@ -19,6 +19,7 @@ package com.android.vpndialogs;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.net.IConnectivityManager;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.ServiceManager;
@@ -50,8 +51,8 @@ public class ManageDialog extends AlertActivity implements
     private Handler mHandler;
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
         if (getCallingPackage() != null) {
             Log.e(TAG, getCallingPackage() + " cannot start this activity");
@@ -108,11 +109,11 @@ public class ManageDialog extends AlertActivity implements
     }
 
     @Override
-    protected void onPause() {
-        super.onPause();
+    protected void onDestroy() {
         if (!isFinishing()) {
             finish();
         }
+        super.onDestroy();
     }
 
     @Override
-- 
2.11.0