PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28036491'] into 24Q3-release.

Browse Source 
Change-Id: Ife612928a2651d27322d7a4da6ad469b530759e4
This commit is contained in:
Android Build Coastguard Worker
2024-07-20 07:19:36 +00:00
parent 6c50d62205 80e709f926
commit 768511b956
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/system/DeviceDiagnosticsPreferenceController.kt
View File

@@ -26,7 +26,7 @@ import com.android.settings.R
import com.android.settings.core.BasePreferenceController import com.android.settings.core.BasePreferenceController
import com.android.settings.flags.Flags import com.android.settings.flags.Flags
class DeviceDiagnosticsPreferenceController(context: Context, preferenceKey: String) : open class DeviceDiagnosticsPreferenceController(context: Context, preferenceKey: String) :
BasePreferenceController(context, preferenceKey) { BasePreferenceController(context, preferenceKey) {
override fun getAvailabilityStatus(): Int { override fun getAvailabilityStatus(): Int {
@@ -59,6 +59,12 @@ class DeviceDiagnosticsPreferenceController(context: Context, preferenceKey: Str
val packageName = mContext.getResources().getString( val packageName = mContext.getResources().getString(
R.string.config_device_diagnostics_package_name) R.string.config_device_diagnostics_package_name)
intent.setPackage(packageName) intent.setPackage(packageName)
val info = mContext.getPackageManager().resolveActivity(intent, 0)
if (info == null) {
return null
}
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
return intent return intent
} }