diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 20:41:32 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 20:41:32 +0000 |
| commit | 9bd654e8be36a6a508757a40bd47588d638f4b6a (patch) | |
| tree | 88b7dd5b8fffff8116d490e8182a3b8b1f51a53d | |
| parent | 2522975d153af3b685163003040bc2d28f151b95 (diff) | |
| parent | 04c420622d1dfaf945db55de70376e327f901581 (diff) | |
| download | CellBroadcastService-android13-mainline-go-tzdata4-release.tar.gz | |
Snap for 8857176 from 04c420622d1dfaf945db55de70376e327f901581 to mainline-go-tzdata4-releaseaml_go_tz4_330912000android13-mainline-go-tzdata4-release
Change-Id: Iac879a6e9505df874856e2a58b8adbf4d80cfb29
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | tests/src/com/android/cellbroadcastservice/tests/CellBroadcastServiceMetricsTest.java | 3 |
2 files changed, 1 insertions, 4 deletions
@@ -6,7 +6,7 @@ package { java_defaults { name: "CellBroadcastServiceCommon", min_sdk_version: "30", - target_sdk_version: "31", + target_sdk_version: "33", srcs: [ "src/**/*.java", ":statslog-cellbroadcast-module-java-gen", diff --git a/tests/src/com/android/cellbroadcastservice/tests/CellBroadcastServiceMetricsTest.java b/tests/src/com/android/cellbroadcastservice/tests/CellBroadcastServiceMetricsTest.java index d926339..70a52c5 100644 --- a/tests/src/com/android/cellbroadcastservice/tests/CellBroadcastServiceMetricsTest.java +++ b/tests/src/com/android/cellbroadcastservice/tests/CellBroadcastServiceMetricsTest.java @@ -69,7 +69,6 @@ public class CellBroadcastServiceMetricsTest extends CellBroadcastServiceTestBas @Test public void testGetFeatureMetrics() { - doReturn(null).when(mMockedContext).getSharedPreferences(anyString(), anyInt()); CellBroadcastServiceMetrics.FeatureMetrics test1 = CellBroadcastServiceMetrics.getInstance().getFeatureMetrics(mMockedContext); CellBroadcastServiceMetrics.FeatureMetrics test2 = @@ -81,8 +80,6 @@ public class CellBroadcastServiceMetricsTest extends CellBroadcastServiceTestBas assertFalse(test1.isOverrideAreaInfoPkgs()); assertFalse(test1.isResetAreaInfo()); - doReturn(mSharedPreference).when(mMockedContext) - .getSharedPreferences(anyString(), anyInt()); doReturn(true).when(mSharedPreference) .getBoolean(eq(ADDITIONAL_CBR_PACKAGES), anyBoolean()); doReturn(false).when(mSharedPreference) |