diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-31 00:25:19 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-31 00:25:19 +0000 |
| commit | c390d9bfc56796fb9e1ee49edd58ce62092a1b84 (patch) | |
| tree | cb708c760530044fdc0d691b0a155d7a1b0b8e34 | |
| parent | d5004306cef029803f02ecf4ffeb1c1abcbb58b4 (diff) | |
| parent | b6d465ae22cbfa1d3f787f54cde1f0a90bfdf830 (diff) | |
| download | shusky-android14-d1-s7-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24351218', 'googleplex-android-review.googlesource.com/24525894', 'googleplex-android-review.googlesource.com/24592571'] into sparse-10683547-L93400000962852954.android-14.0.0_r10android14-d1-s7-release
SPARSE_CHANGE: I0ef0a6a48beccecdc51c0b08fb2390a0483520b8
SPARSE_CHANGE: Ic2453f6c369a1e9b72da27737f80c875d6264bce
SPARSE_CHANGE: Ib7ae8d4e13ae10316ee8693a496e866dcd574562
Change-Id: Ib22b35884b8a9f85d9aa98dbee27cb09af8278c5
| -rw-r--r-- | device-husky.mk | 2 | ||||
| -rw-r--r-- | device-shiba.mk | 2 | ||||
| -rw-r--r-- | husky/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml | 8 | ||||
| -rw-r--r-- | shiba/overlay/frameworks/base/core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | shiba/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml | 8 |
5 files changed, 19 insertions, 3 deletions
diff --git a/device-husky.mk b/device-husky.mk index bde5f0f..4456b14 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -321,7 +321,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-shiba.mk b/device-shiba.mk index 4462813..037ce7b 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -302,7 +302,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ diff --git a/husky/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/husky/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml new file mode 100644 index 0000000..abf2f25 --- /dev/null +++ b/husky/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- set this to ./DevInfo/Mod --> + <string translatable="false" name="config_devinfo_model">G1MNW</string> +</resources> diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index 975a32f..ede96e7 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -140,7 +140,7 @@ <integer name="config_defaultRefreshRate">0</integer> <!-- The default peak refresh rate. --> - <integer name="config_defaultPeakRefreshRate">120</integer> + <integer name="config_defaultPeakRefreshRate">60</integer> <!-- Not allow to switch to higher refresh rate when display brightness setting is equal or less than this value --> diff --git a/shiba/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/shiba/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml new file mode 100644 index 0000000..8cb381c --- /dev/null +++ b/shiba/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- set this to ./DevInfo/Mod --> + <string translatable="false" name="config_devinfo_model">GKWS6</string> +</resources> |