Add a workaround for NPE.

This stop the NPE until b/259387262 gets fixed.

Bug: 265770116
Relnote: NPE fix
Test: atest CtsSafetyCenterTestCases
Change-Id: I80c68ba117582b9e3c4fd088f6698043ddec4f8f

1 files changed, 14 insertions, 4 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/v33/SafetyCenterQsTileService.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/v33/SafetyCenterQsTileService.kt
index 68f26ea22..9af8564f2 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/v33/SafetyCenterQsTileService.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/v33/SafetyCenterQsTileService.kt
@@ -19,12 +19,12 @@ package com.android.permissioncontroller.permission.service.v33
 import android.content.ComponentName
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.graphics.drawable.Icon
 import android.os.IBinder
 import android.provider.DeviceConfig
 import android.safetycenter.SafetyCenterManager
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import android.util.Log
 import com.android.permissioncontroller.R
 
 /**
@@ -36,13 +36,17 @@ class SafetyCenterQsTileService : TileService() {
     override fun onBind(intent: Intent?): IBinder? {
         val scManager = getSystemService(SafetyCenterManager::class.java)!!
         val qsTileComponentSettingFlags =
-            DeviceConfig.getInt(DeviceConfig.NAMESPACE_PRIVACY, QS_TILE_COMPONENT_SETTING_FLAGS,
-            PackageManager.DONT_KILL_APP)
+            DeviceConfig.getInt(
+                DeviceConfig.NAMESPACE_PRIVACY,
+                QS_TILE_COMPONENT_SETTING_FLAGS,
+                PackageManager.DONT_KILL_APP
+            )
         if (!scManager.isSafetyCenterEnabled) {
             packageManager.setComponentEnabledSetting(
                 ComponentName(this, this::class.java),
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                qsTileComponentSettingFlags)
+                qsTileComponentSettingFlags
+            )
             disabled = true
         }
 
@@ -53,6 +57,10 @@ class SafetyCenterQsTileService : TileService() {
         if (disabled) {
             return
         }
+        if (qsTile == null) {
+            Log.w(TAG, "qsTile was null, skipping tile update")
+            return
+        }
 
         qsTile.label = getString(R.string.safety_privacy_qs_tile_title)
         qsTile.subtitle = getString(R.string.safety_privacy_qs_tile_subtitle)
@@ -72,5 +80,7 @@ class SafetyCenterQsTileService : TileService() {
          * tests and cause flakiness.
          */
         const val QS_TILE_COMPONENT_SETTING_FLAGS = "safety_center_qs_tile_component_setting_flags"
+
+        private const val TAG = "SafetyCenterQsTile"
     }
 }