diff options
18 files changed, 283 insertions, 32 deletions
diff --git a/core/java/android/os/storage/IMountService.java b/core/java/android/os/storage/IMountService.java index cf407f401844..116110eba74d 100644 --- a/core/java/android/os/storage/IMountService.java +++ b/core/java/android/os/storage/IMountService.java @@ -856,6 +856,38 @@ public interface IMountService extends IInterface { } return _result; } + + @Override + public long lastMaintenance() throws RemoteException { + Parcel _data = Parcel.obtain(); + Parcel _reply = Parcel.obtain(); + long _result; + try { + _data.writeInterfaceToken(DESCRIPTOR); + mRemote.transact(Stub.TRANSACTION_lastMaintenance, _data, _reply, 0); + _reply.readException(); + _result = _reply.readLong(); + } finally { + _reply.recycle(); + _data.recycle(); + } + return _result; + } + + @Override + public void runMaintenance() throws RemoteException { + Parcel _data = Parcel.obtain(); + Parcel _reply = Parcel.obtain(); + try { + _data.writeInterfaceToken(DESCRIPTOR); + mRemote.transact(Stub.TRANSACTION_runMaintenance, _data, _reply, 0); + _reply.readException(); + } finally { + _reply.recycle(); + _data.recycle(); + } + return; + } } private static final String DESCRIPTOR = "IMountService"; @@ -942,6 +974,10 @@ public interface IMountService extends IInterface { static final int TRANSACTION_resizeSecureContainer = IBinder.FIRST_CALL_TRANSACTION + 40; + static final int TRANSACTION_lastMaintenance = IBinder.FIRST_CALL_TRANSACTION + 41; + + static final int TRANSACTION_runMaintenance = IBinder.FIRST_CALL_TRANSACTION + 42; + /** * Cast an IBinder object into an IMountService interface, generating a * proxy if needed. @@ -1347,6 +1383,19 @@ public interface IMountService extends IInterface { reply.writeInt(resultCode); return true; } + case TRANSACTION_lastMaintenance: { + data.enforceInterface(DESCRIPTOR); + long lastMaintenance = lastMaintenance(); + reply.writeNoException(); + reply.writeLong(lastMaintenance); + return true; + } + case TRANSACTION_runMaintenance: { + data.enforceInterface(DESCRIPTOR); + runMaintenance(); + reply.writeNoException(); + return true; + } } return super.onTransact(code, data, reply, flags); } @@ -1617,4 +1666,18 @@ public interface IMountService extends IInterface { public String getField(String field) throws RemoteException; public int resizeSecureContainer(String id, int sizeMb, String key) throws RemoteException; + + /** + * Report the time of the last maintenance operation such as fstrim. + * @return Timestamp of the last maintenance operation, in the + * System.currentTimeMillis() time base + * @throws RemoteException + */ + public long lastMaintenance() throws RemoteException; + + /** + * Kick off an immediate maintenance operation + * @throws RemoteException + */ + public void runMaintenance() throws RemoteException; } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 79e84d959109..73c7cc38af49 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5544,6 +5544,13 @@ public final class Settings { public static final String PACKAGE_VERIFIER_INCLUDE_ADB = "verifier_verify_adb_installs"; /** + * Time since last fstrim (milliseconds) after which we force one to happen + * during device startup. If unset, the default is 3 days. + * @hide + */ + public static final String FSTRIM_MANDATORY_INTERVAL = "fstrim_mandatory_interval"; + + /** * The interval in milliseconds at which to check packet counts on the * mobile data interface when screen is on, to detect possible data * connection problems. diff --git a/core/java/android/widget/TimePickerSpinnerDelegate.java b/core/java/android/widget/TimePickerSpinnerDelegate.java index 73e05e8d4932..61d3d0f2fdfd 100644 --- a/core/java/android/widget/TimePickerSpinnerDelegate.java +++ b/core/java/android/widget/TimePickerSpinnerDelegate.java @@ -61,6 +61,8 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate im // Also NOT a real index, just used for keyboard mode. private static final int ENABLE_PICKER_INDEX = 3; + // LayoutLib relies on these constants. Change TimePickerSpinnerDelegate_Delegate if + // modifying these. private static final int AM = 0; private static final int PM = 1; diff --git a/core/res/res/values-mcc204-mnc04/config.xml b/core/res/res/values-mcc204-mnc04/config.xml index 3c0381427b8a..c9c96de76043 100644 --- a/core/res/res/values-mcc204-mnc04/config.xml +++ b/core/res/res/values-mcc204-mnc04/config.xml @@ -31,4 +31,9 @@ <item>"*611:+19085594899,BAE0000000000000"</item> <item>"*86:+1MDN,BAE0000000000000"</item> </string-array> + + <string-array translatable="false" name="config_sms_convert_destination_number_support"> + <item>true;BAE0000000000000</item> + <item>false</item> + </string-array> </resources> diff --git a/core/res/res/values-mcc310-mnc004/config.xml b/core/res/res/values-mcc310-mnc004/config.xml index 423e25009bfa..6a34a3dfa8ad 100644 --- a/core/res/res/values-mcc310-mnc004/config.xml +++ b/core/res/res/values-mcc310-mnc004/config.xml @@ -34,4 +34,9 @@ </string-array> <bool name="config_auto_attach_data_on_creation">false</bool> + + <string-array translatable="false" name="config_sms_convert_destination_number_support"> + <item>true</item> + </string-array> + </resources> diff --git a/core/res/res/values-mcc311-mnc480/config.xml b/core/res/res/values-mcc311-mnc480/config.xml index c2be34094d74..379e129bfc47 100644 --- a/core/res/res/values-mcc311-mnc480/config.xml +++ b/core/res/res/values-mcc311-mnc480/config.xml @@ -49,4 +49,9 @@ <item>"*611:+19085594899,"</item> <item>"*86:+1MDN,"</item> </string-array> + + <string-array translatable="false" name="config_sms_convert_destination_number_support"> + <item>true</item> + </string-array> + </resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 1ea37f0768a4..800665971d4c 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1853,4 +1853,20 @@ <bool name="config_switch_phone_on_voice_reg_state_change">true</bool> <bool name="config_sms_force_7bit_encoding">false</bool> + + <!-- This config is used to check if the carrier requires converting destination + number before sending out a SMS. + Formats for this configuration as below: + [true or false][;optional gid] + The logic to pick up the configuration: + (1) If the "config_sms_convert_destination_number_support" array has no gid + special item, the last one will be picked + (2) If the "config_sms_convert_destination_number_support" array has gid special + item and it matches the current sim's gid, it will be picked. + (3) If the "config_sms_convert_destination_number_support" array has gid special + item but it doesn't match the current sim's gid, the last one without gid + will be picked --> + <string-array translatable="false" name="config_sms_convert_destination_number_support"> + <item>false</item> + </string-array> </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index c1568873927e..ab97e17ecf2c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3508,6 +3508,9 @@ <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. --> <string name="android_upgrading_title">Android is upgrading\u2026</string> + <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. --> + <string name="android_upgrading_fstrim">Optimizing storage.</string> + <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. --> <string name="android_upgrading_apk">Optimizing app <xliff:g id="number" example="123">%1$d</xliff:g> of diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 2a9e1d1eb913..30787224e179 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1644,6 +1644,7 @@ <java-symbol type="string" name="aerr_application" /> <java-symbol type="string" name="aerr_process" /> <java-symbol type="string" name="aerr_title" /> + <java-symbol type="string" name="android_upgrading_fstrim" /> <java-symbol type="string" name="android_upgrading_apk" /> <java-symbol type="string" name="android_upgrading_complete" /> <java-symbol type="string" name="android_upgrading_starting_apps" /> @@ -2072,4 +2073,5 @@ <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" /> <java-symbol type="string" name="whichHomeApplicationNamed" /> <java-symbol type="bool" name="config_sms_force_7bit_encoding" /> + <java-symbol type="array" name="config_sms_convert_destination_number_support" /> </resources> diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 6a6dcaf39d3b..b4a248fbec80 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2532,7 +2532,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { String exclList = ""; String pacFileUrl = ""; if (proxyProperties != null && (!TextUtils.isEmpty(proxyProperties.getHost()) || - (proxyProperties.getPacFileUrl() != null))) { + !Uri.EMPTY.equals(proxyProperties.getPacFileUrl()))) { if (!proxyProperties.isValid()) { if (DBG) log("Invalid proxy properties, ignoring: " + proxyProperties.toString()); @@ -2542,7 +2542,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { host = mGlobalProxy.getHost(); port = mGlobalProxy.getPort(); exclList = mGlobalProxy.getExclusionListAsString(); - if (proxyProperties.getPacFileUrl() != null) { + if (!Uri.EMPTY.equals(proxyProperties.getPacFileUrl())) { pacFileUrl = proxyProperties.getPacFileUrl().toString(); } } else { @@ -2604,7 +2604,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { private void handleApplyDefaultProxy(ProxyInfo proxy) { if (proxy != null && TextUtils.isEmpty(proxy.getHost()) - && (proxy.getPacFileUrl() == null)) { + && Uri.EMPTY.equals(proxy.getPacFileUrl())) { proxy = null; } synchronized (mProxyLock) { @@ -2620,7 +2620,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { // global (to get the correct local port), and send a broadcast. // TODO: Switch PacManager to have its own message to send back rather than // reusing EVENT_HAS_CHANGED_PROXY and this call to handleApplyDefaultProxy. - if ((mGlobalProxy != null) && (proxy != null) && (proxy.getPacFileUrl() != null) + if ((mGlobalProxy != null) && (proxy != null) + && (!Uri.EMPTY.equals(proxy.getPacFileUrl())) && proxy.getPacFileUrl().equals(mGlobalProxy.getPacFileUrl())) { mGlobalProxy = proxy; sendProxyBroadcast(mGlobalProxy); diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index e400fb67c0c7..6c981c00504f 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -83,6 +83,7 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.File; import java.io.FileDescriptor; +import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.math.BigInteger; @@ -90,7 +91,9 @@ import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -359,6 +362,11 @@ class MountService extends IMountService.Stub // Used in the ObbActionHandler private IMediaContainerService mContainerService = null; + // Last fstrim operation tracking + private static final String LAST_FSTRIM_FILE = "last-fstrim"; + private final File mLastMaintenanceFile; + private long mLastMaintenance; + // Handler messages private static final int H_UNMOUNT_PM_UPDATE = 1; private static final int H_UNMOUNT_PM_DONE = 2; @@ -536,6 +544,15 @@ class MountService extends IMountService.Stub case H_FSTRIM: { waitForReady(); Slog.i(TAG, "Running fstrim idle maintenance"); + + // Remember when we kicked it off + try { + mLastMaintenance = System.currentTimeMillis(); + mLastMaintenanceFile.setLastModified(mLastMaintenance); + } catch (Exception e) { + Slog.e(TAG, "Unable to record last fstrim!"); + } + try { // This method must be run on the main (handler) thread, // so it is safe to directly call into vold. @@ -544,6 +561,7 @@ class MountService extends IMountService.Stub } catch (NativeDaemonConnectorException ndce) { Slog.e(TAG, "Failed to run fstrim!"); } + // invoke the completion callback, if any Runnable callback = (Runnable) msg.obj; if (callback != null) { @@ -699,6 +717,18 @@ class MountService extends IMountService.Stub mHandler.sendMessage(mHandler.obtainMessage(H_FSTRIM, callback)); } + // Binder entry point for kicking off an immediate fstrim + @Override + public void runMaintenance() { + validatePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); + runIdleMaintenance(null); + } + + @Override + public long lastMaintenance() { + return mLastMaintenance; + } + private void doShareUnshareVolume(String path, String method, boolean enable) { // TODO: Add support for multiple share methods if (!method.equals("ums")) { @@ -1477,6 +1507,22 @@ class MountService extends IMountService.Stub // Add OBB Action Handler to MountService thread. mObbActionHandler = new ObbActionHandler(IoThread.get().getLooper()); + // Initialize the last-fstrim tracking if necessary + File dataDir = Environment.getDataDirectory(); + File systemDir = new File(dataDir, "system"); + mLastMaintenanceFile = new File(systemDir, LAST_FSTRIM_FILE); + if (!mLastMaintenanceFile.exists()) { + // Not setting mLastMaintenance here means that we will force an + // fstrim during reboot following the OTA that installs this code. + try { + (new FileOutputStream(mLastMaintenanceFile)).close(); + } catch (IOException e) { + Slog.e(TAG, "Unable to create fstrim record " + mLastMaintenanceFile.getPath()); + } + } else { + mLastMaintenance = mLastMaintenanceFile.lastModified(); + } + /* * Create the connection to vold with a maximum queue of twice the * amount of containers we'd ever expect to have. This keeps an @@ -3075,6 +3121,12 @@ class MountService extends IMountService.Stub pw.increaseIndent(); mConnector.dump(fd, pw, args); pw.decreaseIndent(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + pw.println(); + pw.print("Last maintenance: "); + pw.println(sdf.format(new Date(mLastMaintenance))); } /** {@inheritDoc} */ diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java index 857b9e90a0a1..b5a450dc8b2c 100644 --- a/services/core/java/com/android/server/net/IpConfigStore.java +++ b/services/core/java/com/android/server/net/IpConfigStore.java @@ -122,8 +122,10 @@ public class IpConfigStore { out.writeUTF(proxyProperties.getHost()); out.writeUTF(PROXY_PORT_KEY); out.writeInt(proxyProperties.getPort()); - out.writeUTF(EXCLUSION_LIST_KEY); - out.writeUTF(exclusionList); + if (exclusionList != null) { + out.writeUTF(EXCLUSION_LIST_KEY); + out.writeUTF(exclusionList); + } written = true; break; case PAC: diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 3e1647ea7949..73ceea3df19b 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -138,6 +138,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.Environment.UserEnvironment; +import android.os.storage.IMountService; import android.os.storage.StorageManager; import android.os.Debug; import android.os.FileUtils; @@ -161,6 +162,7 @@ import android.system.ErrnoException; import android.system.Os; import android.system.StructStat; import android.text.TextUtils; +import android.text.format.DateUtils; import android.util.ArraySet; import android.util.AtomicFile; import android.util.DisplayMetrics; @@ -280,6 +282,18 @@ public class PackageManagerService extends IPackageManager.Stub { private static final long WATCHDOG_TIMEOUT = 1000*60*10; // ten minutes /** + * Wall-clock timeout (in milliseconds) after which we *require* that an fstrim + * be run on this device. We use the value in the Settings.Global.MANDATORY_FSTRIM_INTERVAL + * settings entry if available, otherwise we use the hardcoded default. If it's been + * more than this long since the last fstrim, we force one during the boot sequence. + * + * This backstops other fstrim scheduling: if the device is alive at midnight+idle, + * one gets run at the next available charging+idle time. This final mandatory + * no-fstrim check kicks in only of the other scheduling criteria is never met. + */ + private static final long DEFAULT_MANDATORY_FSTRIM_INTERVAL = 3 * DateUtils.DAY_IN_MILLIS; + + /** * Whether verification is enabled by default. */ private static final boolean DEFAULT_VERIFY_ENABLE = true; @@ -4506,6 +4520,37 @@ public class PackageManagerService extends IPackageManager.Stub { public void performBootDexOpt() { enforceSystemOrRoot("Only the system can request dexopt be performed"); + // Before everything else, see whether we need to fstrim. + try { + IMountService ms = PackageHelper.getMountService(); + if (ms != null) { + final long interval = android.provider.Settings.Global.getLong( + mContext.getContentResolver(), + android.provider.Settings.Global.FSTRIM_MANDATORY_INTERVAL, + DEFAULT_MANDATORY_FSTRIM_INTERVAL); + if (interval > 0) { + final long timeSinceLast = System.currentTimeMillis() - ms.lastMaintenance(); + if (timeSinceLast > interval) { + Slog.w(TAG, "No disk maintenance in " + timeSinceLast + + "; running immediately"); + if (!isFirstBoot()) { + try { + ActivityManagerNative.getDefault().showBootMessage( + mContext.getResources().getString( + R.string.android_upgrading_fstrim), true); + } catch (RemoteException e) { + } + } + ms.runMaintenance(); + } + } + } else { + Slog.e(TAG, "Mount service unavailable!"); + } + } catch (RemoteException e) { + // Can't happen; MountService is local + } + final HashSet<PackageParser.Package> pkgs; synchronized (mPackages) { pkgs = mDeferredDexOpt; diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 92ad1ad742ba..22f6ca468c56 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -546,20 +546,6 @@ public final class SystemServer { reportWtf("making display ready", e); } - try { - mPackageManagerService.performBootDexOpt(); - } catch (Throwable e) { - reportWtf("performing boot dexopt", e); - } - - try { - ActivityManagerNative.getDefault().showBootMessage( - context.getResources().getText( - com.android.internal.R.string.android_upgrading_starting_apps), - false); - } catch (RemoteException e) { - } - if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) { if (!disableStorage && !"0".equals(SystemProperties.get("system_init.startmountservice"))) { @@ -575,7 +561,23 @@ public final class SystemServer { reportWtf("starting Mount Service", e); } } + } + try { + mPackageManagerService.performBootDexOpt(); + } catch (Throwable e) { + reportWtf("performing boot dexopt", e); + } + + try { + ActivityManagerNative.getDefault().showBootMessage( + context.getResources().getText( + com.android.internal.R.string.android_upgrading_starting_apps), + false); + } catch (RemoteException e) { + } + + if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) { if (!disableNonCoreServices) { try { Slog.i(TAG, "LockSettingsService"); diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index c63eb1864b6c..23ba3b6de3e0 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -209,8 +209,13 @@ public class UsbDeviceManager { mUseUsbNotification = !massStorageSupported; // make sure the ADB_ENABLED setting value matches the current state - Settings.Global.putInt(mContentResolver, Settings.Global.ADB_ENABLED, mAdbEnabled ? 1 : 0); - + try { + Settings.Global.putInt(mContentResolver, + Settings.Global.ADB_ENABLED, mAdbEnabled ? 1 : 0); + } catch (SecurityException e) { + // If UserManager.DISALLOW_DEBUGGING_FEATURES is on, that this setting can't be changed. + Slog.d(TAG, "ADB_ENABLED is restricted."); + } mHandler.sendEmptyMessage(MSG_SYSTEM_READY); } diff --git a/tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java b/tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java new file mode 100644 index 000000000000..0d239b870878 --- /dev/null +++ b/tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2014 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 android.widget; + +import com.android.tools.layoutlib.annotations.LayoutlibDelegate; + +import android.view.KeyEvent; + +/** + * Delegate used to provide new implementation of few methods in {@link TimePickerSpinnerDelegate}. + */ +public class TimePickerSpinnerDelegate_Delegate { + + // Copied from TimePickerSpinnerDelegate. + private static final int AM = 0; + private static final int PM = 1; + + @LayoutlibDelegate + static int getAmOrPmKeyCode(int amOrPm) { + // We don't care about locales here. + if (amOrPm == AM) { + return KeyEvent.KEYCODE_A; + } else if (amOrPm == PM) { + return KeyEvent.KEYCODE_P; + } else { + assert false : "amOrPm value in TimePickerSpinnerDelegate can only be 0 or 1"; + return -1; + } + } +} diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java index aeb70e9e2f76..05e38b4a709d 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java @@ -482,16 +482,7 @@ public final class BridgeContext extends Context { // In some cases, style may not be a dynamic id, so we do a full search. ResourceReference ref = resolveId(resid); if (ref != null) { - if (ref.isFramework()) { - ref = - getRenderResources().getFrameworkResource(ResourceType.STYLE, ref.getName()); - } else { - ref = - getRenderResources().getProjectResource(ResourceType.STYLE, ref.getName()); - } - if (ref instanceof StyleResourceValue) { - style = ((StyleResourceValue) ref); - } + mRenderResources.getStyle(ref.getName(), ref.isFramework()); } } diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java index 4e6f4569a39a..1f11ac0bd350 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java @@ -167,6 +167,7 @@ public final class CreateInfo implements ICreateInfo { "android.view.RenderNode#nSetElevation", "android.view.RenderNode#nGetElevation", "android.view.ViewGroup#drawChild", + "android.widget.TimePickerSpinnerDelegate#getAmOrPmKeyCode", "com.android.internal.view.menu.MenuBuilder#createNewMenuItem", "com.android.internal.util.XmlUtils#convertValueToInt", "com.android.internal.textservice.ITextServicesManager$Stub#asInterface", |