Treehugger Robot
befeb2fd56
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
am: 1c49e15945
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I4887a0b14c2a09f4b292d7a3a0d674a998d9593a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 13:03:59 +00:00
Treehugger Robot
218e3151c1
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
am: 87a35ffae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I304e73c7cae7c5669694296002916a5601c8b4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:25:51 +00:00
Treehugger Robot
1c49e15945
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I6c31dcf53c8a8586028fa5c3cb350c7c947b95b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:23:14 +00:00
Treehugger Robot
87a35ffae5
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I7515931a772d74ed2bc7f6ab596cad727ebb68c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:18:56 +00:00
Treehugger Robot
b2de62c076
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev
2023-05-16 11:54:24 +00:00
ykhung
24cbb2c0aa
Limit the optimization mode restore mechanism for specific conditions
...
Limit the app optimization mode restore mechanism is enabled by checking
the isValidToRestoreOptimizationMode() method (default false)
Bug: 280192659
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryBackupHelperTest
Change-Id: I90a438a15905578336bc46ec7cd92d3bbe2858b7
2023-05-16 18:40:11 +08:00
YK Hung
c21833c667
Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
am: 5956d38f7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826
Change-Id: I9b7a75cc18f7e109542550f744a5b1d967415bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:48:21 +00:00
Zoey Chen
6a97cf7afa
[Regional Preference] Should not save "default" into Locale. am: ceebc93e89
am: d4231cb9c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240816
Change-Id: Ic7abcc6361010e3b264967cb472796903e93670a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:48:12 +00:00
YK Hung
784bfcaade
Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
am: fad17f0db9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826
Change-Id: Ia0e507092addf835e4c931ddd4b01820a313dc00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:44:50 +00:00
Zoey Chen
1c298e1c0d
[Regional Preference] Should not save "default" into Locale. am: ceebc93e89
am: 81c2e53cc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240816
Change-Id: Id75c615c658ca564b829e338a237d993e3a6ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:44:41 +00:00
YK Hung
5956d38f7a
Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826
Change-Id: I3773d5d5cd20f2527e32d389479dc798fb86b2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:22:36 +00:00
YK Hung
fad17f0db9
Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826
Change-Id: I3c91272947fa868bb2ae858115bf0af6440b2b97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:06:17 +00:00
Zoey Chen
81c2e53cc0
[Regional Preference] Should not save "default" into Locale. am: ceebc93e89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240816
Change-Id: I87625f73240fb2fde72ece84e04beac939f086d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:06:08 +00:00
YK Hung
1d818600a4
Merge "Add device build information in the backup stage" into udc-dev
2023-05-16 06:03:41 +00:00
Zoey Chen
d4231cb9c4
[Regional Preference] Should not save "default" into Locale. am: ceebc93e89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240816
Change-Id: I6cd310944faf4ba9a91a0c3b949007195d8a7ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:02:05 +00:00
TreeHugger Robot
23cd09fd9e
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
am: 5b26562be8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981
Change-Id: Ie1da2deef4a997a2955c7d14b41ae8a041fab56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 05:17:58 +00:00
TreeHugger Robot
fea14cdaa0
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
am: e51a854b93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981
Change-Id: If0e90b392097e3c3681e62bac0d392bea5f328ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 05:00:49 +00:00
TreeHugger Robot
5b26562be8
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981
Change-Id: Ibf6c8620cbb7eccbeb3df3db47c02782c9a36c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 04:37:03 +00:00
TreeHugger Robot
e51a854b93
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981
Change-Id: I9ba8cd5db9fbcdbee5e4a9a44c278c13bbe89930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 04:32:37 +00:00
Zoey Chen
ceebc93e89
[Regional Preference] Should not save "default" into Locale.
...
Set wrong value in the previous refactory changes, should set valus as null when the default is selected
Bug: 281993323
Test: manual test and QA test
Change-Id: I897791a38a50588d7d721bf57c0d7bdc1734e189
2023-05-16 04:00:07 +00:00
TreeHugger Robot
ab32753382
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev
2023-05-16 03:51:45 +00:00
ykhung
cad41681d6
Add device build information in the backup stage
...
Insert the device build information in the battery optimization mode
backup stage, such that we can use it to decide whether we should
restore the data in the targeted device or not
Bug: 192523697
Test: make test RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I3ab76e013ea9aca4d336a62e0c7cb6882c5b5085
2023-05-16 11:07:31 +08:00
TreeHugger Robot
009455ee17
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
am: e12013a755
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080
Change-Id: I481a8c9e70e3d05b6c59828809732a8ccd6a8dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 01:22:48 +00:00
TreeHugger Robot
84b0e5c316
[automerger skipped] Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12
am: 8caf202fc8
-s ours
...
am skip reason: Merged-In I2587b50b75a161c7b19f1e3430e41b98cfe6cf63 with SHA-1 d126303343
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357
Change-Id: I9debcff79deba789224b1cafc3bdeb385f839db5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 01:22:46 +00:00
TreeHugger Robot
8d01fc110b
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
am: c59fbb1d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080
Change-Id: I0d7a7380fc36fb1870b8931fcc64616ec9d7fe56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 01:21:45 +00:00
TreeHugger Robot
65ed3fde0a
Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12
am: e4510d3bf5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357
Change-Id: I0ed1958d0085ba6c9662ae3bf15905973586d0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 01:21:43 +00:00
TreeHugger Robot
e12013a755
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080
Change-Id: I0d76d4228b2ff45202fc428626c0677d87176aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:41:13 +00:00
TreeHugger Robot
8caf202fc8
Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357
Change-Id: I293b6e1adbd3a332944f4f81b3a774a003728829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:41:10 +00:00
TreeHugger Robot
c59fbb1d28
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080
Change-Id: Ie1f2632f9e3a6825b856555e3aadd8cd81bbcd90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:40:48 +00:00
TreeHugger Robot
e4510d3bf5
Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357
Change-Id: I37bff8aa023f1d26a4b2a785680fedab36125fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:40:46 +00:00
TreeHugger Robot
92e760861d
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev
2023-05-15 23:56:06 +00:00
TreeHugger Robot
116f5c7d12
Merge "Enable presubmit biometrics unit tests" into udc-dev
2023-05-15 23:56:06 +00:00
Ankita Vyas
cb2d59acdc
Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b
am: 837adaafd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819
Change-Id: I2206e4a680b57f60faecb8584a0768a1fdebb641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 18:22:51 +00:00
Ankita Vyas
4e40d8a92b
Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b
am: a988b414bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819
Change-Id: I7c8cfa09021bb0660622486d6096ff4ca5612c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 18:21:25 +00:00
ykhung
f0d13a70fc
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
am: 852e9908ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: Ieb1c749eb112609fb9036874c81a81c553c21fd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 18:20:25 +00:00
ykhung
41e31530cf
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
am: 7a343c34d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: I2677dea8712a8dbe39521d709c50137fe567e4cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 18:15:43 +00:00
Ankita Vyas
837adaafd8
Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819
Change-Id: I568f0902f321d9bfc4ea6d421cef51ae63834dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 17:59:00 +00:00
Ankita Vyas
a988b414bd
Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819
Change-Id: Iec1502a51e7a96073aaaba2691cc41943bf0ae69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 17:37:23 +00:00
Ankita Vyas
44a613438b
Merge "Fetch summary only if feature is available" into udc-dev
2023-05-15 17:37:11 +00:00
ykhung
7a343c34d9
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: I5e0eefdb421970cc0c405666db0e8b629e2423e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 17:36:41 +00:00
ykhung
852e9908ad
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: I3b954248d7edcdb0f3b909ccdc3e2c64c2b1ff04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 17:35:49 +00:00
ykhung
2c125d29a3
Remove useless optimization mode backup for FULL_POWER_LIST
...
Remove the useless backup for the FULL_POWER_LIST, since we will not use
it to restore data, only backup the optimization_mode_list is enough
Test: presubmit
Bug: 192523697
Change-Id: I95f1f41732b8aff090e8b722896d153f6181a6ac
2023-05-15 23:45:16 +08:00
Ankita Vyas
98e4d7bf16
Fetch summary only if feature is available
...
onResume(loads summary) of controller seems to be invoked even when availabilty status
is unspported.
Bug: 278294334
Test: manual
Change-Id: I2486a7d61bea1b981ae56f0ff32b9d411be2ad14
2023-05-15 13:31:38 +00:00
ykhung
29bc0d33d2
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
am: 094281617f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: Ic22dabcfa9f9cb20bb8ec4c953be884a0b2c844b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 13:26:12 +00:00
ykhung
55ef64a3c8
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
am: d056edc15c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: I2520f65c4290bbb113bca305e7f84eb0844e3da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 13:21:25 +00:00
ykhung
d056edc15c
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: I9d81ec00c5f5df7771f28f6bdc4775b7fdba987e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 12:43:08 +00:00
ykhung
094281617f
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: Ic7eb5e46f65c782b0f8922464a126f39c31dd3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 12:39:04 +00:00
ykhung
5cd3a7298e
Disable the optimization mode preference if the app is not settable
...
https://screenshot.googleplex.com/BbQyEv6YCjPVwUF (allowlist)
https://screenshot.googleplex.com/3hTb8TQwGMQqcwS
https://screenshot.googleplex.com/6hdTAT2yNFucD9N (system app)
https://screenshot.googleplex.com/77T5JyAD5nZJpDT (normal app)
Fix: 281566984
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: If7aa4b61bc806daa570187da24b7f454cd069dec
2023-05-15 09:32:09 +00:00
Treehugger Robot
8b0483b0c5
Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56
am: 43cbfa4229
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177
Change-Id: Ief693b107c0102bbacf1d6f89127e1aa116ec11f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 09:09:56 +00:00
Treehugger Robot
ff067bcce0
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb
am: 2150660ddc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878
Change-Id: I3cc19cbd68234046e2288d64e2f09ce12e700976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 09:09:16 +00:00