Use Foo.class.getSimpleName() for LOG_TAG

Avoid calling getSimpleName() on a class type determined at runtime.
This prevents issues with more aggressive R8 optimizations.

Note: Should the Stk app ever switch to using obfuscation, it's probably
better to switch to fixed strings for logging tags.

Bug: 215530220
Test: m + presubmit
Change-Id: I1012148cebf8fe5034bb0283c39853e6322233b1

11 files changed, 11 insertions, 22 deletions

diff --git a/src/com/android/stk/BootCompletedReceiver.java b/src/com/android/stk/BootCompletedReceiver.java
index e972e35..810fefc 100644
--- a/src/com/android/stk/BootCompletedReceiver.java
+++ b/src/com/android/stk/BootCompletedReceiver.java
@@ -30,8 +30,7 @@ import com.android.internal.telephony.cat.CatLog;
  *
  */
 public class BootCompletedReceiver extends BroadcastReceiver {
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = BootCompletedReceiver.class.getSimpleName();
 
     @Override
     public void onReceive(Context context, Intent intent) {
diff --git a/src/com/android/stk/StkAppInstaller.java b/src/com/android/stk/StkAppInstaller.java
index fe25af6..1e96b5e 100644
--- a/src/com/android/stk/StkAppInstaller.java
+++ b/src/com/android/stk/StkAppInstaller.java
@@ -34,8 +34,7 @@ import android.os.ServiceManager;
  */
 final class StkAppInstaller {
     private static final boolean DBG = TelephonyUtils.IS_DEBUGGABLE;
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkAppInstaller.class.getSimpleName();
 
     private StkAppInstaller() {
     }
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 7a9fe18..ffc9d57 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -268,8 +268,7 @@ public class StkAppService extends Service implements Runnable {
     // Notification channel containing all mobile service messages notifications.
     private static final String STK_NOTIFICATION_CHANNEL_ID = "mobileServiceMessages";
 
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkAppService.class.getSimpleName();
 
     static final String SESSION_ENDED = "session_ended";
 
diff --git a/src/com/android/stk/StkCmdReceiver.java b/src/com/android/stk/StkCmdReceiver.java
index 025b68e..cba7446 100644
--- a/src/com/android/stk/StkCmdReceiver.java
+++ b/src/com/android/stk/StkCmdReceiver.java
@@ -31,8 +31,7 @@ import com.android.internal.telephony.cat.AppInterface;
  *
  */
 public class StkCmdReceiver extends BroadcastReceiver {
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkCmdReceiver.class.getSimpleName();
 
     @Override
     public void onReceive(Context context, Intent intent) {
diff --git a/src/com/android/stk/StkDialogActivity.java b/src/com/android/stk/StkDialogActivity.java
index 49dd501..aa5b0df 100644
--- a/src/com/android/stk/StkDialogActivity.java
+++ b/src/com/android/stk/StkDialogActivity.java
@@ -41,8 +41,7 @@ import com.android.internal.telephony.util.TelephonyUtils;
  */
 public class StkDialogActivity extends Activity {
     // members
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkDialogActivity.class.getSimpleName();
     TextMessage mTextMsg = null;
     private int mSlotId = -1;
     private StkAppService appService = StkAppService.getInstance();
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index b9c821b..4b14323 100644
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -67,8 +67,7 @@ public class StkInputActivity extends AppCompatActivity implements View.OnClickL
     private View mNormalLayout = null;
 
     // Constants
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkInputActivity.class.getSimpleName();
 
     private Input mStkInput = null;
     // Constants
diff --git a/src/com/android/stk/StkLauncherActivity.java b/src/com/android/stk/StkLauncherActivity.java
index f1100b2..97b642c 100644
--- a/src/com/android/stk/StkLauncherActivity.java
+++ b/src/com/android/stk/StkLauncherActivity.java
@@ -46,8 +46,7 @@ import java.util.ArrayList;
 public class StkLauncherActivity extends ListActivity {
     private TextView mTitleTextView = null;
     private ImageView mTitleIconView = null;
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkLauncherActivity.class.getSimpleName();
     private ArrayList<Item> mStkMenuList = null;
     private int mSingleSimId = -1;
     private Context mContext = null;
diff --git a/src/com/android/stk/StkMain.java b/src/com/android/stk/StkMain.java
index 0899d2b..c9ff44a 100644
--- a/src/com/android/stk/StkMain.java
+++ b/src/com/android/stk/StkMain.java
@@ -36,8 +36,7 @@ import android.widget.Toast;
  *
  */
  public class StkMain extends Activity {
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkMain.class.getSimpleName();
     private int mSingleSimId = -1;
     private Context mContext = null;
     private TelephonyManager mTm = null;
diff --git a/src/com/android/stk/StkMenuActivity.java b/src/com/android/stk/StkMenuActivity.java
index c75e3ab..f32c1bd 100644
--- a/src/com/android/stk/StkMenuActivity.java
+++ b/src/com/android/stk/StkMenuActivity.java
@@ -60,8 +60,7 @@ public class StkMenuActivity extends ListActivity implements View.OnCreateContex
     private ImageView mTitleIconView = null;
     private ProgressBar mProgressView = null;
 
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkMenuActivity.class.getSimpleName();
 
     private StkAppService appService = StkAppService.getInstance();
 
diff --git a/src/com/android/stk/StkMenuConfig.java b/src/com/android/stk/StkMenuConfig.java
index c437635..ba2a152 100644
--- a/src/com/android/stk/StkMenuConfig.java
+++ b/src/com/android/stk/StkMenuConfig.java
@@ -37,8 +37,7 @@ import java.util.ArrayList;
  * conbination of the inserted SIM card for Multi-SIM model.
  */
 public class StkMenuConfig {
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = StkMenuConfig.class.getSimpleName();
     private static final boolean DBG = TelephonyUtils.IS_DEBUGGABLE;
 
     private static final String XML_OPERATORS_TAG = "operators";
diff --git a/src/com/android/stk/ToneDialog.java b/src/com/android/stk/ToneDialog.java
index 639a216..7617fd8 100644
--- a/src/com/android/stk/ToneDialog.java
+++ b/src/com/android/stk/ToneDialog.java
@@ -43,8 +43,7 @@ public class ToneDialog extends Activity {
     int mSlotId = -1;
     private AlertDialog mAlertDialog;
 
-    private static final String LOG_TAG =
-            new Object(){}.getClass().getEnclosingClass().getSimpleName();
+    private static final String LOG_TAG = ToneDialog.class.getSimpleName();
 
     @Override
     protected void onCreate(Bundle icicle) {