Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 462aea99 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4402249 from 3bdfe1a2 to oc-mr1-release 

Change-Id: Ie68a5adf7e864f4b742298c14ac2487820decafc
parents a7ca5e47 3bdfe1a2

config/compiled-classes-phone

+141 −1

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/strings.xml

+0 −7
Original line number Diff line number Diff line
@@ -2679,8 +2679,6 @@ 
    <string name="yes">OK</string>

    <!-- Preference framework strings. -->

    <string name="no">Cancel</string>

    <!-- Preference framework strings. -->

    <string name="close">CLOSE</string>

    <!-- This is the generic "attention" string to be used in attention dialogs.  Typically

         combined with setIconAttribute(android.R.attr.alertDialogIcon)

         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
@@ -2813,11 +2811,6 @@ 
    <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->

    <string name="screen_compat_mode_hint">Re-enable this in System settings &gt; Apps &gt; Downloaded.</string>



    <!-- Text of the alert that is displayed when a top application is killed by lmk. -->

    <string name="top_app_killed_title">App isn\'t responding</string>

    <!-- Top app killed by lmk dialog message. -->

    <string name="top_app_killed_message"><xliff:g id="app_name">%1$s</xliff:g> may be using too much memory.</string>



    <!-- [CHAR LIMIT=200] Unsupported display size dialog: message. Refers to "Display size" setting. -->

    <string name="unsupported_display_size_message"><xliff:g id="app_name">%1$s</xliff:g> does not support the current Display size setting and may behave unexpectedly.</string>

    <!-- [CHAR LIMIT=50] Unsupported display size dialog: check box label. -->

core/res/res/values/symbols.xml

+0 −3
Original line number Diff line number Diff line
@@ -1890,9 +1890,6 @@ 
  <java-symbol type="string" name="anr_application_process" />

  <java-symbol type="string" name="anr_process" />

  <java-symbol type="string" name="anr_title" />

  <java-symbol type="string" name="top_app_killed_title" />

  <java-symbol type="string" name="top_app_killed_message" />

  <java-symbol type="string" name="close" />

  <java-symbol type="string" name="car_mode_disable_notification_message" />

  <java-symbol type="string" name="car_mode_disable_notification_title" />

  <java-symbol type="string" name="chooser_wallpaper" />

packages/CtsShim/Android.mk

+8 −2
Original line number Diff line number Diff line
@@ -30,8 +30,11 @@ LOCAL_BUILT_MODULE_STEM := package.apk 
# Make sure the build system doesn't try to resign the APK

LOCAL_CERTIFICATE := PRESIGNED

LOCAL_DEX_PREOPT := false

LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64



LOCAL_SRC_FILES := CtsShimPriv.apk

my_archs := arm x86

my_src_arch := $(call get-prebuilt-src-arch, $(my_archs))

LOCAL_SRC_FILES := apk/$(my_src_arch)/CtsShimPriv.apk



include $(BUILD_PREBUILT)
@@ -48,8 +51,11 @@ LOCAL_BUILT_MODULE_STEM := package.apk 
# Make sure the build system doesn't try to resign the APK

LOCAL_CERTIFICATE := PRESIGNED

LOCAL_DEX_PREOPT := false

LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64



LOCAL_SRC_FILES := CtsShim.apk

my_archs := arm x86

my_src_arch := $(call get-prebuilt-src-arch, $(my_archs))

LOCAL_SRC_FILES := apk/$(my_src_arch)/CtsShim.apk



include $(BUILD_PREBUILT)