PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use updated flag.

Browse Source 
Link to the main TARE flag and default value instead of the Settings
default.

Bug: 158300259
Test: atest CtsAlarmManagerTestCases
Test: atest CtsBatterySavingTestCases
Test: atest CtsJobSchedulerTestCases
Test: atest SettingsBackupTest
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/alarm
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/tare
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/tare
Test: Interact with UI and check settings via adb
Change-Id: I6afd0bdf56f39758076b6182fc4893a37760428b
This commit is contained in:
Kweku Adams
2023-02-01 16:12:05 +00:00
parent e312ffa512
commit 2d2db1f711
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/development/tare/TareHomePage.java
View File

@@ -21,6 +21,7 @@ import static com.android.settings.development.tare.DropdownActivity.POLICY_ALAR
import static com.android.settings.development.tare.DropdownActivity.POLICY_JOB_SCHEDULER; import static com.android.settings.development.tare.DropdownActivity.POLICY_JOB_SCHEDULER;
import android.app.Activity; import android.app.Activity;
import android.app.tare.EconomyManager;
import android.content.Intent; import android.content.Intent;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.net.Uri; import android.net.Uri;
@@ -29,6 +30,7 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.CompoundButton; import android.widget.CompoundButton;
@@ -41,6 +43,8 @@ import com.android.settings.R;
/** Class for creating the TARE homepage in settings */ /** Class for creating the TARE homepage in settings */
public class TareHomePage extends Activity { public class TareHomePage extends Activity {
private static final String TAG = "TareHomePage";
private Switch mOnSwitch; private Switch mOnSwitch;
private Button mRevButton; private Button mRevButton;
private TextView mAlarmManagerView; private TextView mAlarmManagerView;
@@ -131,8 +135,6 @@ public class TareHomePage extends Activity {
} }
private class ConfigObserver extends ContentObserver { private class ConfigObserver extends ContentObserver {
private static final String KEY_DC_ENABLE_TARE = "enable_tare";
private int mEnableTareSetting; private int mEnableTareSetting;
ConfigObserver(Handler handler) { ConfigObserver(Handler handler) {
@@ -163,7 +165,8 @@ public class TareHomePage extends Activity {
try { try {
mEnableTareSetting = Integer.parseInt(setting); mEnableTareSetting = Integer.parseInt(setting);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
mEnableTareSetting = Settings.Global.DEFAULT_ENABLE_TARE; Log.e(TAG, "Invalid setting value", e);
mEnableTareSetting = EconomyManager.DEFAULT_ENABLE_TARE_MODE;
} }
} }
final boolean enabled; final boolean enabled;
@@ -178,9 +181,10 @@ public class TareHomePage extends Activity {
} }
private boolean getDefaultEnabledStatus() { private boolean getDefaultEnabledStatus() {
return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_TARE, KEY_DC_ENABLE_TARE, // Show Shadow Mode as "off" in the UI since it won't be affecting device behavior.
Settings.Global.DEFAULT_ENABLE_TARE == SETTING_VALUE_ON); return DeviceConfig.getInt(DeviceConfig.NAMESPACE_TARE,
EconomyManager.KEY_ENABLE_TARE_MODE,
EconomyManager.DEFAULT_ENABLE_TARE_MODE) == EconomyManager.ENABLED_MODE_ON;
} }
} }
} }