Merge "RESTRICT AUTOMERGE Disable Safety Center Tile" into tm-dev

2 files changed, 0 insertions, 15 deletions

diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml
index c177f28ee..2da7b2d43 100644
--- a/PermissionController/AndroidManifest.xml
+++ b/PermissionController/AndroidManifest.xml
@@ -351,16 +351,6 @@
             </intent-filter>
         </service>
 
-         <service android:name="com.android.permissioncontroller.permission.service.v33.SafetyCenterQsTileService"
-                  android:exported="true"
-                  android:label="@string/safety_privacy_qs_tile_title"
-                  android:icon ="@drawable/safety_shield"
-                  android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-             <intent-filter>
-                 <action android:name="android.service.quicksettings.action.QS_TILE" />
-             </intent-filter>
-         </service>
-
         <service android:name="com.android.permissioncontroller.auto.DrivingDecisionReminderService" />
 
         <receiver android:name="com.android.permissioncontroller.role.service.ClearUserDeniedReceiver"
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 bf60e000b..d4cd8df9d 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/v33/SafetyCenterQsTileService.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/v33/SafetyCenterQsTileService.kt
@@ -19,7 +19,6 @@ 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.safetycenter.SafetyCenterManager
 import android.service.quicksettings.Tile
@@ -33,8 +32,6 @@ class SafetyCenterQsTileService : TileService() {
     private var disabled = false
 
     override fun onBind(intent: Intent?): IBinder? {
-        /*
-        TODO ntmyren: open permissions to permissioncontroller
         val scManager = getSystemService(SafetyCenterManager::class.java)!!
         if (!scManager.isSafetyCenterEnabled) {
             packageManager.setComponentEnabledSetting(ComponentName(this, this::class.java),
@@ -42,8 +39,6 @@ class SafetyCenterQsTileService : TileService() {
             disabled = true
         }
 
-         */
-
         return super.onBind(intent)
     }
     override fun onStartListening() {