nehemiah-zb/lineage_patches_unified
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial unified commit for Android 13, with "light" GSI target

Browse Source
This commit is contained in:
Andy CrossGate Yan
2022-09-28 15:49:08 +00:00
commit 65d23014f6
83 changed files with 8544 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

356
patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch Normal file
View File

@@ -0,0 +1,356 @@
From 4ecdcc515e80750e3423a5c203048b76aae0809c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 22 Sep 2022 12:37:50 +0000
Subject: [PATCH 1/3] TrebleSettings: Screen resolution & refresh rate
Change-Id: I4a4679cdb6d4ede55479e9ab2f014342025b0fec
---
AndroidManifest.xml | 8 +
res/drawable/ic_settings_treble.xml | 10 ++
res/values/menu_keys.xml | 1 +
res/values/strings.xml | 10 ++
res/xml/top_level_settings.xml | 9 +
res/xml/treble_settings.xml | 18 ++
...lutionRefreshRatePreferenceController.java | 169 ++++++++++++++++++
.../settings/treble/TrebleSettings.java | 39 ++++
8 files changed, 264 insertions(+)
create mode 100644 res/drawable/ic_settings_treble.xml
create mode 100644 res/xml/treble_settings.xml
create mode 100644 src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java
create mode 100644 src/com/android/settings/treble/TrebleSettings.java
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d800bb472e..1495e851a7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -220,6 +220,14 @@
android:value="com.android.settings.shortcut.CreateShortcut" />
</activity>
+ <receiver
+ android:name=".treble.ScreenResolutionRefreshRatePreferenceController$BootReceiver"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.BOOT_COMPLETED"/>
+ </intent-filter>
+ </receiver>
+
<!-- Wireless Controls -->
<activity
android:name=".Settings$NetworkDashboardActivity"
diff --git a/res/drawable/ic_settings_treble.xml b/res/drawable/ic_settings_treble.xml
new file mode 100644
index 0000000000..3c56ed7032
--- /dev/null
+++ b/res/drawable/ic_settings_treble.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M10.82 12.49c.02-.16.04-.32.04-.49 0-.17-.02-.33-.04-.49l1.08-.82c.1-.07.12-.21.06-.32l-1.03-1.73c-.06-.11-.2-.15-.31-.11l-1.28.5c-.27-.2-.56-.36-.87-.49l-.2-1.33c0-.12-.11-.21-.24-.21H5.98c-.13 0-.24.09-.26.21l-.2 1.32c-.31.12-.6.3-.87.49l-1.28-.5c-.12-.05-.25 0-.31.11l-1.03 1.73c-.06.12-.03.25.07.33l1.08.82c-.02.16-.03.33-.03.49 0 .17.02.33.04.49l-1.09.83c-.1.07-.12.21-.06.32l1.03 1.73c.06.11.2.15.31.11l1.28-.5c.27.2.56.36.87.49l.2 1.32c.01.12.12.21.25.21h2.06c.13 0 .24-.09.25-.21l.2-1.32c.31-.12.6-.3.87-.49l1.28.5c.12.05.25 0 .31-.11l1.03-1.73c.06-.11.04-.24-.06-.32l-1.1-.83zM7 13.75c-.99 0-1.8-.78-1.8-1.75s.81-1.75 1.8-1.75 1.8.78 1.8 1.75S8 13.75 7 13.75zM18 1.01L8 1c-1.1 0-2 .9-2 2v3h2V5h10v14H8v-1H6v3c0 1.1.9 2 2 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-1.99-2-1.99z"/>
+</vector>
diff --git a/res/values/menu_keys.xml b/res/values/menu_keys.xml
index 2841b699c9..c30d6392e9 100755
--- a/res/values/menu_keys.xml
+++ b/res/values/menu_keys.xml
@@ -16,6 +16,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="menu_key_treble" translatable="false">top_level_treble</string>
<string name="menu_key_network" translatable="false">top_level_network</string>
<string name="menu_key_connected_devices" translatable="false">top_level_connected_devices</string>
<string name="menu_key_apps" translatable="false">top_level_apps</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04b2de208b..8cebfe3964 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8274,6 +8274,16 @@
<item quantity="other">Show %d hidden items</item>
</plurals>
+ <!-- Title for setting tile leading to Treble settings [CHAR LIMIT=40]-->
+ <string name="treble_settings">Treble settings</string>
+ <!-- Summary for Treble settings [CHAR LIMIT=NONE]-->
+ <string name="treble_settings_summary">Fixes &amp; tweaks for GSIs</string>
+ <!-- Display category name [CHAR LIMIT=none] -->
+ <string name="treble_settings_category_name_display">Display</string>
+
+ <!-- Treble settings screen, screen resolution and refresh rate settings title -->
+ <string name="screen_resolution_refresh_rate_title">Screen resolution &amp; refresh rate</string>
+
<!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
<string name="network_dashboard_title">Network &amp; internet</string>
<!-- Summary for Network and Internet settings, explaining it contains mobile, wifi setting and data usage settings [CHAR LIMIT=NONE]-->
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index c9e60170eb..1127056675 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -20,6 +20,15 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="top_level_settings">
+ <com.android.settings.widget.HomepagePreference
+ android:fragment="com.android.settings.treble.TrebleSettings"
+ android:icon="@drawable/ic_settings_treble"
+ android:key="top_level_treble"
+ android:order="-160"
+ android:title="@string/treble_settings"
+ android:summary="@string/treble_settings_summary"
+ settings:highlightableMenuKey="@string/menu_key_treble"/>
+
<com.android.settings.widget.HomepagePreference
android:fragment="com.android.settings.network.NetworkDashboardFragment"
android:icon="@drawable/ic_settings_wireless"
diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
new file mode 100644
index 0000000000..1a82c468a2
--- /dev/null
+++ b/res/xml/treble_settings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="treble_settings_screen"
+ android:title="@string/treble_settings">
+
+ <PreferenceCategory
+ android:title="@string/treble_settings_category_name_display">
+
+ <ListPreference
+ android:key="screen_resolution_refresh_rate"
+ android:title="@string/screen_resolution_refresh_rate_title" />
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java b/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java
new file mode 100644
index 0000000000..5d14f13209
--- /dev/null
+++ b/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java
@@ -0,0 +1,169 @@
+package com.android.settings.treble;
+
+import static android.content.Intent.ACTION_BOOT_COMPLETED;
+
+import android.app.ActivityManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.view.SurfaceControl;
+import android.view.SurfaceControl.DisplayMode;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ScreenResolutionRefreshRatePreferenceController extends BasePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ private static final String SCREEN_RESOLUTION_REFRESH_RATE_KEY = "screen_resolution_refresh_rate";
+ private static final String SURFACE_FLINGER_SERVICE_KEY = "SurfaceFlinger";
+ private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer";
+ private static final int SURFACE_FLINGER_CODE = 1035;
+ private static final String TREBLE_DISPLAY_MODE_PROPERTY = "persist.sys.treble.display_mode";
+ private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
+
+ private ActivityManager mAm;
+ private ListPreference mListPreference;
+ private List<DisplayMode> mModes = new ArrayList<>();
+ private List<String> mEntries = new ArrayList<>();
+ private List<String> mValues = new ArrayList<>();
+
+ public ScreenResolutionRefreshRatePreferenceController(Context context) {
+ super(context, SCREEN_RESOLUTION_REFRESH_RATE_KEY);
+
+ mAm = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+
+ DisplayMode[] supportedDisplayModes =
+ SurfaceControl.getDynamicDisplayInfo(SurfaceControl.getInternalDisplayToken()).supportedDisplayModes;
+ Set<String> summarySet = new HashSet<>();
+ for (DisplayMode m : supportedDisplayModes) {
+ String summary = String.format("%dx%d @ %dHz", m.width, m.height, Math.round(m.refreshRate));
+ if (!summarySet.contains(summary)) {
+ summarySet.add(summary);
+ mModes.add(m);
+ }
+ }
+ Collections.sort(mModes, Comparator.comparing((DisplayMode m)->m.width)
+ .thenComparing(m->m.height)
+ .thenComparing(m->m.refreshRate)
+ .thenComparing(m->m.id));
+ for (DisplayMode m : mModes) {
+ String summary = String.format("%dx%d @ %dHz", m.width, m.height, Math.round(m.refreshRate));
+ mEntries.add(summary);
+ mValues.add(String.valueOf(m.id));
+ }
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return SCREEN_RESOLUTION_REFRESH_RATE_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mListPreference = screen.findPreference(getPreferenceKey());
+ mListPreference.setEntries(mEntries.toArray(new String[mEntries.size()]));
+ mListPreference.setEntryValues(mValues.toArray(new String[mValues.size()]));
+
+ if (mEntries.size() <= 1) {
+ mListPreference.setEnabled(false);
+ }
+
+ super.displayPreference(screen);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ int id = SurfaceControl.getDynamicDisplayInfo(SurfaceControl.getInternalDisplayToken()).activeDisplayModeId;
+ int index = mListPreference.findIndexOfValue(String.valueOf(id));
+ mListPreference.setValueIndex(index);
+ mListPreference.setSummary(mListPreference.getEntries()[index]);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ DisplayMode currentMode = getCurrentMode();
+ int id = Integer.valueOf((String) newValue);
+ DisplayMode newMode = getModeById(id);
+ setModeFromBackdoor(id);
+ SystemProperties.set(TREBLE_DISPLAY_MODE_PROPERTY, (String) newValue);
+ int index = mListPreference.findIndexOfValue((String) newValue);
+ mListPreference.setValueIndex(index);
+ mListPreference.setSummary(mListPreference.getEntries()[index]);
+ if ((newMode.width != currentMode.width) || (newMode.height != currentMode.height)) {
+ try {
+ for (ActivityManager.RunningAppProcessInfo app: mAm.getRunningAppProcesses()) {
+ if (app.processName.equals(SYSTEMUI_PACKAGE_NAME)) {
+ ActivityManager.getService().killApplicationProcess(app.processName, app.uid);
+ break;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return true;
+ }
+
+ private DisplayMode getCurrentMode() {
+ int id = SurfaceControl.getDynamicDisplayInfo(SurfaceControl.getInternalDisplayToken()).activeDisplayModeId;
+ return getModeById(id);
+ }
+
+ private DisplayMode getModeById(int id) {
+ for (DisplayMode m : mModes) {
+ if (m.id == id) {
+ return m;
+ }
+ }
+ return null;
+ }
+
+ public static void setModeFromBackdoor(int id) {
+ IBinder surfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY);
+ try {
+ if (surfaceFlinger != null) {
+ Parcel data = Parcel.obtain();
+ data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+ data.writeInt(id);
+ surfaceFlinger.transact(SURFACE_FLINGER_CODE, data, null, 0);
+ data.recycle();
+ }
+ } catch (RemoteException ex) {}
+ }
+
+ public static class BootReceiver extends BroadcastReceiver {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+ int id = SystemProperties.getInt(TREBLE_DISPLAY_MODE_PROPERTY, -1);
+ if (id != -1) {
+ setModeFromBackdoor(id);
+ }
+ }
+ }
+
+ }
+
+}
diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
new file mode 100644
index 0000000000..e581539229
--- /dev/null
+++ b/src/com/android/settings/treble/TrebleSettings.java
@@ -0,0 +1,39 @@
+package com.android.settings.treble;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TrebleSettings extends DashboardFragment {
+
+ private static final String TAG = "TrebleSettings";
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.treble_settings;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.SETTINGS_TREBLE_CATEGORY;
+ }
+
+ @Override
+ protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ controllers.add(new ScreenResolutionRefreshRatePreferenceController(context));
+ return controllers;
+ }
+
+}
--
2.25.1

288
patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch Normal file
View File

@@ -0,0 +1,288 @@
From 937c56865ea02e00886920f40cabd85ab293a5fb Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 24 Sep 2022 03:38:41 +0000
Subject: [PATCH 2/3] TrebleSettings: Basic audio and display fixes
- Alternative audio policy
- Disable soundvolume effect
- Alternative backlight scale
Change-Id: I4f22dcd9c59c40b3fd70ba642db35b9466467b7d
---
res/values/strings.xml | 8 +++
res/xml/treble_settings.xml | 17 ++++++
...SoundvolumeEffectPreferenceController.java | 59 +++++++++++++++++++
.../settings/treble/TrebleSettings.java | 3 +
...nativeAudioPolicyPreferenceController.java | 59 +++++++++++++++++++
...iveBacklightScalePreferenceController.java | 53 +++++++++++++++++
6 files changed, 199 insertions(+)
create mode 100644 src/com/android/settings/treble/DisableSoundvolumeEffectPreferenceController.java
create mode 100644 src/com/android/settings/treble/UseAlternativeAudioPolicyPreferenceController.java
create mode 100644 src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8cebfe3964..4014c53eaa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8278,11 +8278,19 @@
<string name="treble_settings">Treble settings</string>
<!-- Summary for Treble settings [CHAR LIMIT=NONE]-->
<string name="treble_settings_summary">Fixes &amp; tweaks for GSIs</string>
+ <!-- Audio category name [CHAR LIMIT=none] -->
+ <string name="treble_settings_category_name_audio">Audio</string>
<!-- Display category name [CHAR LIMIT=none] -->
<string name="treble_settings_category_name_display">Display</string>
+ <!-- Treble settings screen, use alternative audio policy title -->
+ <string name="use_alternative_audio_policy_title">Use alternative audio policy</string>
+ <!-- Treble settings screen, disable soundvolume effect title -->
+ <string name="disable_soundvolume_effect_title">Disable soundvolume effect</string>
<!-- Treble settings screen, screen resolution and refresh rate settings title -->
<string name="screen_resolution_refresh_rate_title">Screen resolution &amp; refresh rate</string>
+ <!-- Treble settings screen, use alternative backlight scale title -->
+ <string name="use_alternative_backlight_scale_title">Use alternative backlight scale</string>
<!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
<string name="network_dashboard_title">Network &amp; internet</string>
diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
index 1a82c468a2..336137c95f 100644
--- a/res/xml/treble_settings.xml
+++ b/res/xml/treble_settings.xml
@@ -6,6 +6,19 @@
android:key="treble_settings_screen"
android:title="@string/treble_settings">
+ <PreferenceCategory
+ android:title="@string/treble_settings_category_name_audio">
+
+ <SwitchPreference
+ android:key="use_alternative_audio_policy"
+ android:title="@string/use_alternative_audio_policy_title" />
+
+ <SwitchPreference
+ android:key="disable_soundvolume_effect"
+ android:title="@string/disable_soundvolume_effect_title" />
+
+ </PreferenceCategory>
+
<PreferenceCategory
android:title="@string/treble_settings_category_name_display">
@@ -13,6 +26,10 @@
android:key="screen_resolution_refresh_rate"
android:title="@string/screen_resolution_refresh_rate_title" />
+ <SwitchPreference
+ android:key="use_alternative_backlight_scale"
+ android:title="@string/use_alternative_backlight_scale_title" />
+
</PreferenceCategory>
</PreferenceScreen>
diff --git a/src/com/android/settings/treble/DisableSoundvolumeEffectPreferenceController.java b/src/com/android/settings/treble/DisableSoundvolumeEffectPreferenceController.java
new file mode 100644
index 0000000000..8feb318f55
--- /dev/null
+++ b/src/com/android/settings/treble/DisableSoundvolumeEffectPreferenceController.java
@@ -0,0 +1,59 @@
+package com.android.settings.treble;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class DisableSoundvolumeEffectPreferenceController extends BasePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ private static final String DISABLE_SOUNDVOLUME_EFFECT_KEY = "disable_soundvolume_effect";
+ private static final String RO_HARDWARE_PROPERTY = "ro.hardware";
+ private static final String TREBLE_CAF_DISABLE_SOUNDVOLUME_EFFECT_PROPERTY = "persist.sys.treble.caf.disable_soundvolume_effect";
+
+ private SwitchPreference mSwitchPreference;
+
+ public DisableSoundvolumeEffectPreferenceController(Context context) {
+ super(context, DISABLE_SOUNDVOLUME_EFFECT_KEY);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return DISABLE_SOUNDVOLUME_EFFECT_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mSwitchPreference = screen.findPreference(getPreferenceKey());
+
+ if (!SystemProperties.get(RO_HARDWARE_PROPERTY, "N/A").equals("qcom")) {
+ mSwitchPreference.setEnabled(false);
+ }
+
+ super.displayPreference(screen);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ boolean checked = SystemProperties.getBoolean(TREBLE_CAF_DISABLE_SOUNDVOLUME_EFFECT_PROPERTY, false);
+ mSwitchPreference.setChecked(checked);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ SystemProperties.set(TREBLE_CAF_DISABLE_SOUNDVOLUME_EFFECT_PROPERTY, String.valueOf((boolean) newValue));
+ mSwitchPreference.setChecked((boolean) newValue);
+ return true;
+ }
+
+}
diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
index e581539229..5c1611c053 100644
--- a/src/com/android/settings/treble/TrebleSettings.java
+++ b/src/com/android/settings/treble/TrebleSettings.java
@@ -32,7 +32,10 @@ public class TrebleSettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ controllers.add(new UseAlternativeAudioPolicyPreferenceController(context));
+ controllers.add(new DisableSoundvolumeEffectPreferenceController(context));
controllers.add(new ScreenResolutionRefreshRatePreferenceController(context));
+ controllers.add(new UseAlternativeBacklightScalePreferenceController(context));
return controllers;
}
diff --git a/src/com/android/settings/treble/UseAlternativeAudioPolicyPreferenceController.java b/src/com/android/settings/treble/UseAlternativeAudioPolicyPreferenceController.java
new file mode 100644
index 0000000000..fbc327cba0
--- /dev/null
+++ b/src/com/android/settings/treble/UseAlternativeAudioPolicyPreferenceController.java
@@ -0,0 +1,59 @@
+package com.android.settings.treble;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class UseAlternativeAudioPolicyPreferenceController extends BasePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ private static final String USE_ALTERNATIVE_AUDIO_POLICY_KEY = "use_alternative_audio_policy";
+ private static final String RO_HARDWARE_PROPERTY = "ro.hardware";
+ private static final String TREBLE_CAF_AUDIO_POLICY_PROPERTY = "persist.sys.treble.caf.audio_policy";
+
+ private SwitchPreference mSwitchPreference;
+
+ public UseAlternativeAudioPolicyPreferenceController(Context context) {
+ super(context, USE_ALTERNATIVE_AUDIO_POLICY_KEY);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return USE_ALTERNATIVE_AUDIO_POLICY_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mSwitchPreference = screen.findPreference(getPreferenceKey());
+
+ if (!SystemProperties.get(RO_HARDWARE_PROPERTY, "N/A").equals("qcom")) {
+ mSwitchPreference.setEnabled(false);
+ }
+
+ super.displayPreference(screen);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ boolean checked = SystemProperties.getBoolean(TREBLE_CAF_AUDIO_POLICY_PROPERTY, false);
+ mSwitchPreference.setChecked(checked);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ SystemProperties.set(TREBLE_CAF_AUDIO_POLICY_PROPERTY, String.valueOf((boolean) newValue));
+ mSwitchPreference.setChecked((boolean) newValue);
+ return true;
+ }
+
+}
diff --git a/src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java b/src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java
new file mode 100644
index 0000000000..bd9de82d90
--- /dev/null
+++ b/src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java
@@ -0,0 +1,53 @@
+package com.android.settings.treble;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class UseAlternativeBacklightScalePreferenceController extends BasePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ private static final String USE_ALTERNATIVE_BACKLIGHT_SCALE_KEY = "use_alternative_backlight_scale";
+ private static final String TREBLE_BACKLIGHT_SCALE_PROPERTY = "persist.sys.treble.backlight_scale";
+
+ private SwitchPreference mSwitchPreference;
+
+ public UseAlternativeBacklightScalePreferenceController(Context context) {
+ super(context, USE_ALTERNATIVE_BACKLIGHT_SCALE_KEY);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return USE_ALTERNATIVE_BACKLIGHT_SCALE_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mSwitchPreference = screen.findPreference(getPreferenceKey());
+ super.displayPreference(screen);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ boolean checked = SystemProperties.getBoolean(TREBLE_BACKLIGHT_SCALE_PROPERTY, false);
+ mSwitchPreference.setChecked(checked);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ SystemProperties.set(TREBLE_BACKLIGHT_SCALE_PROPERTY, String.valueOf((boolean) newValue));
+ mSwitchPreference.setChecked((boolean) newValue);
+ return true;
+ }
+
+}
--
2.25.1

363
patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch Normal file
View File

@@ -0,0 +1,363 @@
From 106235d2d4f2e0540a0a73332cfecf465942e9cc Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 11 Oct 2022 10:29:36 +0000
Subject: [PATCH 3/3] TrebleSettings: IMS
Change-Id: Id7a12e150d4a3dc988f8ce1a888ad88443fa0ea4
---
Android.bp | 1 +
res/values/strings.xml | 9 +
res/xml/treble_settings.xml | 13 ++
.../InstallImsApkPreferenceController.java | 198 ++++++++++++++++++
...VolteAvailabilityPreferenceController.java | 59 ++++++
.../settings/treble/TrebleSettings.java | 2 +
6 files changed, 282 insertions(+)
create mode 100644 src/com/android/settings/treble/InstallImsApkPreferenceController.java
create mode 100644 src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java
diff --git a/Android.bp b/Android.bp
index 140d4480c8..c73a774a28 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,6 +81,7 @@ android_library {
"LineagePreferenceLib",
"vendor.lineage.fastcharge-V1.0-java",
"SystemUISharedLib",
+ "android.hidl.manager-V1.0-java",
],
libs: [
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4014c53eaa..ef8ffbbf46 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8282,6 +8282,8 @@
<string name="treble_settings_category_name_audio">Audio</string>
<!-- Display category name [CHAR LIMIT=none] -->
<string name="treble_settings_category_name_display">Display</string>
+ <!-- IMS category name [CHAR LIMIT=none] -->
+ <string name="treble_settings_category_name_ims">IMS</string>
<!-- Treble settings screen, use alternative audio policy title -->
<string name="use_alternative_audio_policy_title">Use alternative audio policy</string>
@@ -8291,6 +8293,13 @@
<string name="screen_resolution_refresh_rate_title">Screen resolution &amp; refresh rate</string>
<!-- Treble settings screen, use alternative backlight scale title -->
<string name="use_alternative_backlight_scale_title">Use alternative backlight scale</string>
+ <!-- Treble settings screen, install IMS APK title -->
+ <string name="install_ims_apk_title">Install IMS APK</string>
+ <!-- Treble settings screen, install IMS APK toasts -->
+ <string name="install_ims_apk_toast_downloading">Downloading IMS APK...</string>
+ <string name="install_ims_apk_toast_completed">IMS APK installed. Reboot required.</string>
+ <!-- Treble settings screen, override VoLTE availability title -->
+ <string name="override_volte_availability_title">Override VoLTE availability</string>
<!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
<string name="network_dashboard_title">Network &amp; internet</string>
diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
index 336137c95f..09e6bc5d00 100644
--- a/res/xml/treble_settings.xml
+++ b/res/xml/treble_settings.xml
@@ -32,4 +32,17 @@
</PreferenceCategory>
+ <PreferenceCategory
+ android:title="@string/treble_settings_category_name_ims">
+
+ <Preference
+ android:key="install_ims_apk"
+ android:title="@string/install_ims_apk_title" />
+
+ <SwitchPreference
+ android:key="override_volte_availability"
+ android:title="@string/override_volte_availability_title" />
+
+ </PreferenceCategory>
+
</PreferenceScreen>
diff --git a/src/com/android/settings/treble/InstallImsApkPreferenceController.java b/src/com/android/settings/treble/InstallImsApkPreferenceController.java
new file mode 100644
index 0000000000..f59e5d7d9a
--- /dev/null
+++ b/src/com/android/settings/treble/InstallImsApkPreferenceController.java
@@ -0,0 +1,198 @@
+package com.android.settings.treble;
+
+import android.app.DownloadManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageInstaller;
+import android.database.Cursor;
+import android.hidl.manager.V1_0.IServiceManager;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class InstallImsApkPreferenceController extends BasePreferenceController
+ implements Preference.OnPreferenceClickListener {
+
+ private static final String TAG = "TrebleSettings";
+ private static final String INSTALL_IMS_APK_KEY = "install_ims_apk";
+ private static final String[] IMS_SLOTS = {
+ "imsrild1", "imsrild2", "imsrild3",
+ "slot1", "slot2", "slot3",
+ "imsSlot1", "imsSlot2",
+ "mtkSlot1", "mtkSlot2",
+ "imsradio0", "imsradio1"
+ };
+ private static final String RO_PRODUCT_VENDOR_BRAND_PROPERTY = "ro.product.vendor.brand";
+
+ private Preference mPreference;
+ private String mImsType = "none";
+ private String mImsApkUrl = "";
+
+ public InstallImsApkPreferenceController(Context context) {
+ super(context, INSTALL_IMS_APK_KEY);
+
+ mImsType = getImsType();
+ Log.d(TAG, "IMS type = " + mImsType);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return INSTALL_IMS_APK_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mPreference = screen.findPreference(getPreferenceKey());
+
+ if (mImsType.equals("none")) {
+ mPreference.setEnabled(false);
+ } else {
+ mPreference.setOnPreferenceClickListener(this);
+ }
+
+ super.displayPreference(screen);
+ }
+
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ switch (mImsType) {
+ case "qcom_hidl_moto":
+ mImsApkUrl = "https://treble.phh.me/stable/ims-caf-moto.apk";
+ break;
+ case "qcom_hidl":
+ mImsApkUrl = "https://treble.phh.me/stable/ims-q.64.apk";
+ break;
+ case "qcom_aidl":
+ mImsApkUrl = "https://treble.phh.me/stable/ims-caf-s.apk";
+ break;
+ case "mtk_p":
+ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-p.apk";
+ break;
+ case "mtk_q":
+ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-q.apk";
+ break;
+ case "mtk_r":
+ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-r.apk";
+ break;
+ case "mtk_s":
+ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-s.apk";
+ break;
+ default:
+ break;
+ }
+
+ Context context = preference.getContext();
+ DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+ DownloadManager.Request request = new DownloadManager.Request(Uri.parse(mImsApkUrl));
+ request.setTitle("IMS APK");
+ request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+ request.setDestinationInExternalFilesDir(context, Environment.DIRECTORY_DOWNLOADS, "ims.apk");
+ long id = dm.enqueue(request);
+ Toast.makeText(context, context.getString(R.string.install_ims_apk_toast_downloading), Toast.LENGTH_LONG).show();
+
+ context.registerReceiver(new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1L) != id) {
+ return;
+ }
+ Cursor cursor = dm.query(new DownloadManager.Query().setFilterById(id));
+ if (!cursor.moveToFirst()) {
+ return;
+ }
+ Uri localUri = Uri.parse(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)));
+ String path = localUri.getPath();
+ if (path == null) {
+ return;
+ }
+ long fileSize = 0;
+ File file = new File(path);
+ if (file.isFile()) {
+ fileSize = file.length();
+ } else {
+ return;
+ }
+
+ try (InputStream in = new FileInputStream(path)) {
+ PackageInstaller pi = context.getPackageManager().getPackageInstaller();
+ int sessionId = pi.createSession(new PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL));
+ PackageInstaller.Session session = pi.openSession(sessionId);
+ try (OutputStream out = session.openWrite(TAG, 0, fileSize)) {
+ byte[] buffer = new byte[512 * 1024];
+ while (in.available() > 0) {
+ int l = in.read(buffer);
+ out.write(buffer, 0, l);
+ }
+ session.fsync(out);
+ }
+ String action = TAG + "_" + sessionId;
+ PendingIntent pendingIntent = PendingIntent.getBroadcast(context, sessionId,
+ new Intent(action), PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
+ context.registerReceiver(new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ Toast.makeText(context, context.getString(R.string.install_ims_apk_toast_completed), Toast.LENGTH_LONG).show();
+ }
+ }, new IntentFilter(action));
+ session.commit(pendingIntent.getIntentSender());
+ context.unregisterReceiver(this);
+ } catch (IOException ex) {
+ Log.d(TAG, "IOException while installing IMS APK");
+ }
+ }
+ }, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+
+ return false;
+ }
+
+ protected static String getImsType() {
+ try {
+ IServiceManager hidlManager = IServiceManager.getService();
+ for (String slot: IMS_SLOTS) {
+ if (hidlManager.get("vendor.qti.hardware.radio.ims@1.0::IImsRadio", slot) != null) {
+ if (SystemProperties.get(RO_PRODUCT_VENDOR_BRAND_PROPERTY, "N/A").equals("motorola")) {
+ return "qcom_hidl_moto";
+ }
+ return "qcom_hidl";
+ } else if (ServiceManager.getService("vendor.qti.hardware.radio.ims.IImsRadio/" + slot) != null) {
+ return "qcom_aidl";
+ } else if (hidlManager.get("vendor.mediatek.hardware.radio@3.0::IRadio", slot) != null) {
+ return "mtk_p";
+ } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@1.0::IMtkRadioEx", slot) != null) {
+ return "mtk_q";
+ } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@2.0::IMtkRadioEx", slot) != null) {
+ return "mtk_r";
+ } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@3.0::IMtkRadioEx", slot) != null) {
+ return "mtk_s";
+ }
+ }
+ } catch (RemoteException ex) {}
+
+ return "none";
+ }
+
+}
diff --git a/src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java b/src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java
new file mode 100644
index 0000000000..1ab12d3ca0
--- /dev/null
+++ b/src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java
@@ -0,0 +1,59 @@
+package com.android.settings.treble;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class OverrideVolteAvailabilityPreferenceController extends BasePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ private static final String OVERRIDE_VOLTE_AVAILABILITY_KEY = "override_volte_availability";
+ private static final String[] IMSMANAGER_DEBUG_OVERRIDE_PROPERTIES = {
+ "persist.dbg.volte_avail_ovr",
+ "persist.dbg.wfc_avail_ovr",
+ "persist.dbg.allow_ims_off"
+ };
+
+ private SwitchPreference mSwitchPreference;
+
+ public OverrideVolteAvailabilityPreferenceController(Context context) {
+ super(context, OVERRIDE_VOLTE_AVAILABILITY_KEY);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return OVERRIDE_VOLTE_AVAILABILITY_KEY;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mSwitchPreference = screen.findPreference(getPreferenceKey());
+ super.displayPreference(screen);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ boolean checked = SystemProperties.getBoolean(IMSMANAGER_DEBUG_OVERRIDE_PROPERTIES[0], false);
+ mSwitchPreference.setChecked(checked);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ for (String prop: IMSMANAGER_DEBUG_OVERRIDE_PROPERTIES) {
+ SystemProperties.set(prop, ((boolean) newValue) ? "1" : "0");
+ }
+ mSwitchPreference.setChecked((boolean) newValue);
+ return true;
+ }
+
+}
diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
index 5c1611c053..50e3eda8c6 100644
--- a/src/com/android/settings/treble/TrebleSettings.java
+++ b/src/com/android/settings/treble/TrebleSettings.java
@@ -36,6 +36,8 @@ public class TrebleSettings extends DashboardFragment {
controllers.add(new DisableSoundvolumeEffectPreferenceController(context));
controllers.add(new ScreenResolutionRefreshRatePreferenceController(context));
controllers.add(new UseAlternativeBacklightScalePreferenceController(context));
+ controllers.add(new InstallImsApkPreferenceController(context));
+ controllers.add(new OverrideVolteAvailabilityPreferenceController(context));
return controllers;
}
--
2.25.1