diff options
| author | 2020-12-29 10:42:33 -0800 | |
|---|---|---|
| committer | 2021-01-05 21:54:31 +0000 | |
| commit | 196bafdc64d3a4062ead108d6c871773c5ec722c (patch) | |
| tree | 48fd7ffe13bc25b672447d6fdd380fc34aa55ff3 | |
| parent | 6bcc71b13609f0d598ab3208b2a4fd90019e574d (diff) | |
Clean up dead code in NetInitiatedActivity
Bug: 174151048
Test: on device
Change-Id: I5a3a77557720571b455ffec296cdd4e2e1a02f7b
(cherry picked from commit b5765cc3e75d9f4a7ff9e805b2225de5790d3cfe)
| -rw-r--r-- | core/java/com/android/internal/app/NetInitiatedActivity.java | 31 | ||||
| -rw-r--r-- | location/java/com/android/internal/location/GpsNetInitiatedHandler.java | 3 | 
2 files changed, 0 insertions, 34 deletions
| diff --git a/core/java/com/android/internal/app/NetInitiatedActivity.java b/core/java/com/android/internal/app/NetInitiatedActivity.java index 92e9fe492442..5efeb0fc928e 100644 --- a/core/java/com/android/internal/app/NetInitiatedActivity.java +++ b/core/java/com/android/internal/app/NetInitiatedActivity.java @@ -17,18 +17,14 @@  package com.android.internal.app;  import android.app.AlertDialog; -import android.compat.annotation.UnsupportedAppUsage; -import android.content.BroadcastReceiver;  import android.content.Context;  import android.content.DialogInterface;  import android.content.Intent; -import android.content.IntentFilter;  import android.location.LocationManagerInternal;  import android.os.Bundle;  import android.os.Handler;  import android.os.Message;  import android.util.Log; -import android.widget.Toast;  import com.android.internal.R;  import com.android.internal.location.GpsNetInitiatedHandler; @@ -43,7 +39,6 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa      private static final String TAG = "NetInitiatedActivity";      private static final boolean DEBUG = true; -    private static final boolean VERBOSE = false;      private static final int POSITIVE_BUTTON = AlertDialog.BUTTON_POSITIVE;      private static final int NEGATIVE_BUTTON = AlertDialog.BUTTON_NEGATIVE; @@ -55,17 +50,6 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa      private int default_response = -1;      private int default_response_timeout = 6; -    /** Used to detect when NI request is received */ -    private BroadcastReceiver mNetInitiatedReceiver = new BroadcastReceiver() { -        @Override -        public void onReceive(Context context, Intent intent) { -            if (DEBUG) Log.d(TAG, "NetInitiatedReceiver onReceive: " + intent.getAction()); -            if (intent.getAction() == GpsNetInitiatedHandler.ACTION_NI_VERIFY) { -                handleNIVerify(intent); -            } -        } -    }; -      private final Handler mHandler = new Handler() {          public void handleMessage(Message msg) {              switch (msg.what) { @@ -109,14 +93,12 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa      protected void onResume() {          super.onResume();          if (DEBUG) Log.d(TAG, "onResume"); -        registerReceiver(mNetInitiatedReceiver, new IntentFilter(GpsNetInitiatedHandler.ACTION_NI_VERIFY));      }      @Override      protected void onPause() {          super.onPause();          if (DEBUG) Log.d(TAG, "onPause"); -        unregisterReceiver(mNetInitiatedReceiver);      }      /** @@ -141,17 +123,4 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa          LocationManagerInternal lm = LocalServices.getService(LocationManagerInternal.class);          lm.sendNiResponse(notificationId, response);      } - -    @UnsupportedAppUsage -    private void handleNIVerify(Intent intent) { -        int notifId = intent.getIntExtra(GpsNetInitiatedHandler.NI_INTENT_KEY_NOTIF_ID, -1); -        notificationId = notifId; - -        if (DEBUG) Log.d(TAG, "handleNIVerify action: " + intent.getAction()); -    } - -    private void showNIError() { -        Toast.makeText(this, "NI error" /* com.android.internal.R.string.usb_storage_error_message */, -                Toast.LENGTH_LONG).show(); -    }  } diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java index 67a040dba3e7..a3765151a6f7 100644 --- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java +++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java @@ -51,9 +51,6 @@ public class GpsNetInitiatedHandler {      private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); -    // NI verify activity for bringing up UI (not used yet) -    public static final String ACTION_NI_VERIFY = "android.intent.action.NETWORK_INITIATED_VERIFY"; -      // string constants for defining data fields in NI Intent      public static final String NI_INTENT_KEY_NOTIF_ID = "notif_id";      public static final String NI_INTENT_KEY_TITLE = "title"; |