Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Set device name from marketname if available

Browse Source 
Change-Id: If974ac38638fca9b100008d1b5404d876faf42e2
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Joey Huab <joey@evolution-x.org>
Signed-off-by: Dmitrii <bankersenator@gmail.com>
This commit is contained in:
Pranav Vashi
2021-12-17 02:51:46 +05:30
committed by Joey
parent 15e36f3a04
commit f393af61f2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
View File

@@ -22,6 +22,7 @@ import android.net.wifi.SoftApConfiguration;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemProperties;
import android.provider.Settings; import android.provider.Settings;
import android.text.SpannedString; import android.text.SpannedString;
@@ -44,6 +45,8 @@ public class DeviceNamePreferenceController extends BasePreferenceController
LifecycleObserver, LifecycleObserver,
OnSaveInstanceState, OnSaveInstanceState,
OnCreate { OnCreate {
private static final String KEY_MARKET_NAME_PROP = "ro.product.marketname";
private static final String KEY_PENDING_DEVICE_NAME = "key_pending_device_name"; private static final String KEY_PENDING_DEVICE_NAME = "key_pending_device_name";
@VisibleForTesting @VisibleForTesting
static final int RES_SHOW_DEVICE_NAME_BOOL = R.bool.config_show_device_name; static final int RES_SHOW_DEVICE_NAME_BOOL = R.bool.config_show_device_name;
@@ -76,11 +79,11 @@ public class DeviceNamePreferenceController extends BasePreferenceController
} }
private void initializeDeviceName() { private void initializeDeviceName() {
mDeviceName = Settings.Global.getString(mContext.getContentResolver(), String deviceName = Settings.Global.getString(mContext.getContentResolver(),
Settings.Global.DEVICE_NAME); Settings.Global.DEVICE_NAME);
if (mDeviceName == null) { if (deviceName == null)
mDeviceName = Build.MODEL; deviceName = Build.MODEL;
} mDeviceName = SystemProperties.get(KEY_MARKET_NAME_PROP, deviceName);
} }
@Override @Override