Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b5daf18 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Revert "Handle crash when SecurityException" 

This reverts commit 45cabc2c.

Reason for revert: this change hides exceptions and these exceptions can prove useful for detecting issues with test or device setup early on.

Bug: 336470991
Change-Id: Ic2eb5fadd77a370e6c669794e0100327eea70ad7
parent 45cabc2c

packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderClient.kt

+6 −27
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ import kotlinx.coroutines.CoroutineDispatcher 
import kotlinx.coroutines.channels.awaitClose

import kotlinx.coroutines.channels.awaitClose

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.callbackFlow

import kotlinx.coroutines.flow.callbackFlow

import kotlinx.coroutines.flow.emptyFlow

import kotlinx.coroutines.flow.flowOn

import kotlinx.coroutines.flow.flowOn

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.onStart

import kotlinx.coroutines.flow.onStart
@@ -297,21 +296,11 @@ class CustomizationProviderClientImpl( 
    }

    }





    override fun observeSlots(): Flow<List<CustomizationProviderClient.Slot>> {

    override fun observeSlots(): Flow<List<CustomizationProviderClient.Slot>> {

        return try {

        return observeUri(Contract.LockScreenQuickAffordances.SlotTable.URI).map { querySlots() }

            observeUri(Contract.LockScreenQuickAffordances.SlotTable.URI).map { querySlots() }

        } catch (e: SecurityException) {

            Log.e(TAG, "Failed to observe the slots", e)

            emptyFlow()

        }

    }

    }





    override fun observeFlags(): Flow<List<CustomizationProviderClient.Flag>> {

    override fun observeFlags(): Flow<List<CustomizationProviderClient.Flag>> {

        return try {

        return observeUri(Contract.FlagsTable.URI).map { queryFlags() }

            observeUri(Contract.FlagsTable.URI).map { queryFlags() }

        } catch (e: SecurityException) {

            Log.e(TAG, "Failed to observe the flags", e)

            emptyFlow()

        }

    }

    }





    override suspend fun queryAffordances(): List<CustomizationProviderClient.Affordance> {

    override suspend fun queryAffordances(): List<CustomizationProviderClient.Affordance> {
@@ -405,14 +394,9 @@ class CustomizationProviderClientImpl( 
    }

    }





    override fun observeAffordances(): Flow<List<CustomizationProviderClient.Affordance>> {

    override fun observeAffordances(): Flow<List<CustomizationProviderClient.Affordance>> {

        return try {

        return observeUri(Contract.LockScreenQuickAffordances.AffordanceTable.URI).map {

            observeUri(Contract.LockScreenQuickAffordances.AffordanceTable.URI).map {

            queryAffordances()

            queryAffordances()

        }

        }

        } catch (e: SecurityException) {

            Log.e(TAG, "Failed to observe the affordances", e)

            emptyFlow()

        }

    }

    }





    override suspend fun querySelections(): List<CustomizationProviderClient.Selection> {

    override suspend fun querySelections(): List<CustomizationProviderClient.Selection> {
@@ -464,14 +448,9 @@ class CustomizationProviderClientImpl( 
    }

    }





    override fun observeSelections(): Flow<List<CustomizationProviderClient.Selection>> {

    override fun observeSelections(): Flow<List<CustomizationProviderClient.Selection>> {

        return try {

        return observeUri(Contract.LockScreenQuickAffordances.SelectionTable.URI).map {

            observeUri(Contract.LockScreenQuickAffordances.SelectionTable.URI).map {

            querySelections()

            querySelections()

        }

        }

        } catch (e: SecurityException) {

            Log.e(TAG, "Failed to observe the selections", e)

            emptyFlow()

        }

    }

    }





    override suspend fun deleteSelection(slotId: String, affordanceId: String) {

    override suspend fun deleteSelection(slotId: String, affordanceId: String) {