Merge "Revert "Expose hidden resources used in telephony/common"" (25e0cdc0) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -229,9 +229,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
		}

		@@ -279,7 +276,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 {

+0 −6

Original line number	Diff line number	Diff line
		@@ -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):

+0 −9

Original line number	Diff line number	Diff line
		@@ -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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

+5 −5

Original line number	Diff line number	Diff line
		@@ -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 =