diff options
| -rwxr-xr-x | api/system-current.txt | 4 | ||||
| -rw-r--r-- | api/system-lint-baseline.txt | 6 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 9 | ||||
| -rw-r--r-- | telephony/common/com/android/internal/telephony/CarrierAppUtils.java | 3 | ||||
| -rw-r--r-- | telephony/common/com/android/internal/telephony/GsmAlphabet.java | 10 | ||||
| -rw-r--r-- | telephony/common/com/google/android/mms/util/SqliteWrapper.java | 3 |
6 files changed, 9 insertions, 26 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8f3a12655bef..3e853a9e02d3 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -228,9 +228,6 @@ package android { public static final class R.array { field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005 - field public static final int config_restrictedPreinstalledCarrierApps = 17235975; // 0x1070007 - field public static final int config_sms_enabled_locking_shift_tables = 17235977; // 0x1070009 - field public static final int config_sms_enabled_single_shift_tables = 17235976; // 0x1070008 field public static final int simColors = 17235974; // 0x1070006 } @@ -278,7 +275,6 @@ package android { field public static final int config_helpIntentNameKey = 17039390; // 0x104001e field public static final int config_helpPackageNameKey = 17039387; // 0x104001b field public static final int config_helpPackageNameValue = 17039388; // 0x104001c - field public static final int low_memory = 17039397; // 0x1040025 } public static final class R.style { diff --git a/api/system-lint-baseline.txt b/api/system-lint-baseline.txt index d2b3a6446346..306b8afaadae 100644 --- a/api/system-lint-baseline.txt +++ b/api/system-lint-baseline.txt @@ -165,12 +165,6 @@ PublicTypedef: android.content.integrity.Formula.Tag: Don't expose @IntDef: @Tag PublicTypedef: android.content.integrity.Rule.Effect: Don't expose @IntDef: @Effect must be hidden. -ResourceValueFieldName: android.R.array#config_sms_enabled_locking_shift_tables: - Expected resource name in `android.R.array` to be in the `fooBarBaz` style, was `config_sms_enabled_locking_shift_tables` -ResourceValueFieldName: android.R.array#config_sms_enabled_single_shift_tables: - Expected resource name in `android.R.array` to be in the `fooBarBaz` style, was `config_sms_enabled_single_shift_tables` - - SamShouldBeLast: android.accounts.AccountManager#addAccount(String, String, String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): SamShouldBeLast: android.accounts.AccountManager#addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean): diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 93080e9a8016..8a7b515ee436 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3010,8 +3010,6 @@ </public-group> <public-group type="string" first-id="0x01040025"> - <!-- @hide @SystemApi --> - <public name="low_memory" /> </public-group> <public-group type="bool" first-id="0x01110005"> @@ -3026,14 +3024,7 @@ <public-group type="array" first-id="0x01070006"> <!-- @hide @SystemApi --> <public name="simColors" /> - <!-- @hide @SystemApi --> - <public name="config_restrictedPreinstalledCarrierApps" /> - <!-- @hide @SystemApi --> - <public name="config_sms_enabled_single_shift_tables" /> - <!-- @hide @SystemApi --> - <public name="config_sms_enabled_locking_shift_tables" /> </public-group> - <!-- =============================================================== DO NOT ADD UN-GROUPED ITEMS HERE diff --git a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java index de0221c7c2b1..3c1e707ab1dd 100644 --- a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java +++ b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java @@ -31,6 +31,7 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; +import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.util.ArrayUtils; import com.android.server.SystemConfig; @@ -156,7 +157,7 @@ public final class CarrierAppUtils { for (ApplicationInfo ai : candidates) { String packageName = ai.packageName; String[] restrictedCarrierApps = Resources.getSystem().getStringArray( - android.R.array.config_restrictedPreinstalledCarrierApps); + R.array.config_restrictedPreinstalledCarrierApps); boolean hasPrivileges = telephonyManager != null && telephonyManager.checkCarrierPrivilegesForPackageAnyPhone(packageName) == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS diff --git a/telephony/common/com/android/internal/telephony/GsmAlphabet.java b/telephony/common/com/android/internal/telephony/GsmAlphabet.java index 2201452e9011..60cd40094950 100644 --- a/telephony/common/com/android/internal/telephony/GsmAlphabet.java +++ b/telephony/common/com/android/internal/telephony/GsmAlphabet.java @@ -19,10 +19,12 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.os.Build; -import android.text.TextUtils; import android.util.Log; +import android.text.TextUtils; import android.util.SparseIntArray; +import com.android.internal.R; + import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.ArrayList; @@ -1085,10 +1087,8 @@ public class GsmAlphabet { private static void enableCountrySpecificEncodings() { Resources r = Resources.getSystem(); // See comments in frameworks/base/core/res/res/values/config.xml for allowed values - sEnabledSingleShiftTables = r.getIntArray( - android.R.array.config_sms_enabled_single_shift_tables); - sEnabledLockingShiftTables = r.getIntArray( - android.R.array.config_sms_enabled_locking_shift_tables); + sEnabledSingleShiftTables = r.getIntArray(R.array.config_sms_enabled_single_shift_tables); + sEnabledLockingShiftTables = r.getIntArray(R.array.config_sms_enabled_locking_shift_tables); if (sEnabledSingleShiftTables.length > 0) { sHighestEnabledSingleShiftCode = diff --git a/telephony/common/com/google/android/mms/util/SqliteWrapper.java b/telephony/common/com/google/android/mms/util/SqliteWrapper.java index 4871434ebc31..31fe4d7683d6 100644 --- a/telephony/common/com/google/android/mms/util/SqliteWrapper.java +++ b/telephony/common/com/google/android/mms/util/SqliteWrapper.java @@ -60,7 +60,8 @@ public final class SqliteWrapper { @UnsupportedAppUsage public static void checkSQLiteException(Context context, SQLiteException e) { if (isLowMemory(e)) { - Toast.makeText(context, android.R.string.low_memory, Toast.LENGTH_SHORT).show(); + Toast.makeText(context, com.android.internal.R.string.low_memory, + Toast.LENGTH_SHORT).show(); } else { throw e; } |