-
-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add userId check before loading icon in Device Controls
Test: manual with the steps from the bug Test: manual with a normal icon Test: atest CanUseIconPredicate Test: atest ControlViewHolderTest Bug: 272025416 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:22f97f081ccc6f6a7230b15447a6c885dfe4fa59) Merged-In: Ib0e677f7ccbed6299ea07939519c7dcf6d371bec Change-Id: Ib0e677f7ccbed6299ea07939519c7dcf6d371bec
- Loading branch information
1 parent
922a786
commit ed183ed
Showing
11 changed files
with
173 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
packages/SystemUI/src/com/android/systemui/controls/ui/CanUseIconPredicate.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright (C) 2023 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.android.systemui.controls.ui | ||
|
|
||
| import android.content.ContentProvider | ||
| import android.graphics.drawable.Icon | ||
|
|
||
| class CanUseIconPredicate(private val currentUserId: Int) : (Icon) -> Boolean { | ||
|
|
||
| override fun invoke(icon: Icon): Boolean = | ||
| if (icon.type == Icon.TYPE_URI || icon.type == Icon.TYPE_URI_ADAPTIVE_BITMAP) { | ||
| ContentProvider.getUserIdFromUri(icon.uri, currentUserId) == currentUserId | ||
| } else { | ||
| true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
packages/SystemUI/tests/src/com/android/systemui/controls/ui/CanUseIconPredicateTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright (C) 2023 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.android.systemui.controls.ui | ||
|
|
||
| import android.content.ContentProvider | ||
| import android.graphics.Bitmap | ||
| import android.graphics.drawable.Icon | ||
| import android.net.Uri | ||
| import android.os.UserHandle | ||
| import android.testing.AndroidTestingRunner | ||
| import androidx.test.filters.SmallTest | ||
| import com.android.systemui.SysuiTestCase | ||
| import com.google.common.truth.Truth.assertThat | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| @SmallTest | ||
| @RunWith(AndroidTestingRunner::class) | ||
| class CanUseIconPredicateTest : SysuiTestCase() { | ||
|
|
||
| private companion object { | ||
| const val USER_ID_1 = 1 | ||
| const val USER_ID_2 = 2 | ||
| } | ||
|
|
||
| val underTest: CanUseIconPredicate = CanUseIconPredicate(USER_ID_1) | ||
|
|
||
| @Test | ||
| fun testReturnsFalseForDifferentUser() { | ||
| val user2Icon = | ||
| Icon.createWithContentUri( | ||
| ContentProvider.createContentUriForUser( | ||
| Uri.parse("content://test"), | ||
| UserHandle.of(USER_ID_2) | ||
| ) | ||
| ) | ||
|
|
||
| assertThat(underTest.invoke(user2Icon)).isFalse() | ||
| } | ||
|
|
||
| @Test | ||
| fun testReturnsTrueForCorrectUser() { | ||
| val user1Icon = | ||
| Icon.createWithContentUri( | ||
| ContentProvider.createContentUriForUser( | ||
| Uri.parse("content://test"), | ||
| UserHandle.of(USER_ID_1) | ||
| ) | ||
| ) | ||
|
|
||
| assertThat(underTest.invoke(user1Icon)).isTrue() | ||
| } | ||
|
|
||
| @Test | ||
| fun testReturnsTrueForUriWithoutUser() { | ||
| val uriIcon = Icon.createWithContentUri(Uri.parse("content://test")) | ||
|
|
||
| assertThat(underTest.invoke(uriIcon)).isTrue() | ||
| } | ||
|
|
||
| @Test | ||
| fun testReturnsTrueForNonUriIcon() { | ||
| val bitmapIcon = Icon.createWithBitmap(Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)) | ||
|
|
||
| assertThat(underTest.invoke(bitmapIcon)).isTrue() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters