From 3cf13adf9bb38b3067ff3eb30628651776efb159 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Tue, 20 Nov 2018 15:01:22 -0800 Subject: [PATCH] Remove ShadowLibcoreTimeZoneNames Bug: 119829838 Test: Treehugger (cherry picked from commit cc2cf5ba5a8ffa1eb95b71534f256046e429f9ea) Change-Id: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c Merged-In: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c --- .../shadow/ShadowLibcoreTimeZoneNames.java | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowLibcoreTimeZoneNames.java diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLibcoreTimeZoneNames.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLibcoreTimeZoneNames.java deleted file mode 100644 index 7292234a8b..0000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLibcoreTimeZoneNames.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2016 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.settings.testutils.shadow; - -import libcore.icu.TimeZoneNames; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.RealObject; -import org.robolectric.util.ReflectionHelpers; - -import java.util.Locale; -import java.util.TimeZone; - -/** - * System.logI used by ZoneStringsCache.create is a method new in API 24 and not available in - * Robolectric's 6.0 jar. Create a shadow which removes that log call. - */ -@Implements(value = TimeZoneNames.class, isInAndroidSdk = false) -public class ShadowLibcoreTimeZoneNames { - - private static final String[] availableTimeZoneIds = TimeZone.getAvailableIDs(); - - @Implements(value = TimeZoneNames.ZoneStringsCache.class, isInAndroidSdk = false) - public static class ShadowZoneStringsCache { - - @RealObject - private TimeZoneNames.ZoneStringsCache mRealObject; - - @Implementation - public String[][] create(Locale locale) { - // Set up the 2D array used to hold the names. The first column contains the Olson ids. - String[][] result = new String[availableTimeZoneIds.length][5]; - for (int i = 0; i < availableTimeZoneIds.length; ++i) { - result[i][0] = availableTimeZoneIds[i]; - } - - ReflectionHelpers.callInstanceMethod(TimeZoneNames.class, - mRealObject, "fillZoneStrings", - ReflectionHelpers.ClassParameter.from(String.class, locale.toLanguageTag()), - ReflectionHelpers.ClassParameter.from(String[][].class, result)); - - return result; - } - } -} -- 2.11.0