Weng Su
973211dba5
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: Ib42cd4909a5d6265ee2a3181df4c34b0c32a79bb
2021-10-08 07:22:21 +00:00
Weng Su
77d30c4d0c
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I5d0fa94c0b09106bb65764ffbd4636209f685c35
2021-10-08 07:22:20 +00:00
Weng Su
1400ff3139
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: Ie039408dcee182693303390eca26386ff6c546d2
2021-10-08 07:22:20 +00:00
Bonian Chen
78c18a1b45
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev
2021-10-07 23:42:43 +00:00
TreeHugger Robot
57e7d9c4b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-07 08:40:47 +00:00
Bill Yi
98f9ed5934
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
2021-10-07 02:37:16 +00:00
Chen Chen
2b7a6c4407
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
...
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:54:38 +00:00
Weng Su
d408d7c408
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev
2021-10-06 18:48:39 +00:00
Weng Su
e736eff6db
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
2021-10-06 18:48:39 +00:00
Bonian Chen
71818bdf15
[Settings] Adopt comfirm SIM deletion to euicc reset UI
...
There's an "Erase downloaded SIMs" option within reset options UI.
When reset EUICC, eSIM profile might get removed.
There's a security feature "Confirm SIM deletion" need to be applied in
this case.
Bug: 194145231
Test: local
Change-Id: I1798dfe347be7d0610a12fb79f103efece2ab240
(cherry picked from commit ebca15a861
)
2021-10-06 16:58:07 +00:00
Daniel Solomon
396939a577
Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev
2021-10-05 22:44:19 +00:00
Weng Su
ca67955d7d
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
...
This reverts commit 71e728e934
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-05 12:04:33 +00:00
Weng Su
f733da4859
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
...
This reverts commit 199528d460
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-05 12:04:14 +00:00
Weng Su
e92d1d1a6b
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
...
This reverts commit 56a88885cc
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-05 12:03:07 +00:00
Bill Yi
a516da5761
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0590d5697883acc61ef586054d1ceb0820162159
2021-10-05 01:44:34 +00:00
Weng Su
f603e671e7
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
...
This reverts commit 71e728e934
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-03 18:26:32 +00:00
TreeHugger Robot
da8e9c1108
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-02 06:34:33 +00:00
Bill Yi
41533a64d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a5eb92a2e472ba7faca95791c4b748f71c20a58
2021-10-02 04:46:24 +00:00
Bill Yi
853fdb2f22
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: If00f802350f9a2769fb8cc2d992c0f7b42f09f43
2021-10-02 04:43:05 +00:00
Bill Yi
ae858a0237
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6ce3387fb38bbb8530d28c7265ccd7563e19be4d
2021-10-02 04:42:52 +00:00
TreeHugger Robot
468bad73d7
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev
2021-10-01 23:26:52 +00:00
TreeHugger Robot
e750fb7528
Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev
2021-10-01 18:15:58 +00:00
Weng Su
f9e7a17247
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
...
This reverts commit 56a88885cc
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-01 15:00:12 +00:00
Weng Su
f1f0353ed7
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
...
This reverts commit 199528d460
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-01 14:51:33 +00:00
Sunny Shao
f25e8aa74c
Add more info on the dialog of AllowBindAppWidgetActivity
...
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.
Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
Merged-In: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
(cherry picked from commit 1564ef5ca1
)
2021-10-01 05:45:49 +00:00
TreeHugger Robot
cddd334ee6
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ia84dd48edcae481fb006b582e9e5c2274d2e86e7
2021-09-30 19:06:45 +00:00
TreeHugger Robot
a2e975064e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev
2021-09-30 18:51:47 +00:00
TreeHugger Robot
7ba545d992
Merge "Fix USB tether option" into sc-qpr1-dev
2021-09-30 12:06:41 +00:00
Bill Yi
bdbca48e77
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
Import translations. DO NOT MERGE ANYWHERE
2021-09-29 17:08:57 +00:00
TreeHugger Robot
83423b2dff
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-29 08:04:35 +00:00
Bill Yi
069684e925
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5025bf1696bea34629632b29351fc463f33ef27d
2021-09-28 09:04:57 +00:00
Bill Yi
a27f0eaf3d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I0ab870320ff4498bd159cef7c9659eef3ce00139
2021-09-28 09:01:33 +00:00
Bill Yi
3769790fed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5cf6feb89d6b5418866abcb32e14d00eaaae73ef
2021-09-28 09:01:22 +00:00
YUKAI HUNG
36072e86ef
Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev
2021-09-28 07:19:59 +00:00
YUKAI HUNG
4a4f13d5b0
Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev
2021-09-28 07:12:01 +00:00
Bill Yi
7378aac868
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
Import translations. DO NOT MERGE ANYWHERE
2021-09-27 14:33:16 +00:00
ykhung
68421b5df8
[S-QPR1] add package name for enable/disable app user actions metric
...
add package name into the metric per @wangkelly request to analyze users behavior in the battery setting relative CUJ:
go/battery-setting-enums
go/battery-setting-metrics-dev
Bug: 199807285
Test: make SettingsRoboTests
Change-Id: Ica6da59b933b0dcff940215d4e537a670bac52cb
(cherry picked from commit e12712dd1d
)
2021-09-27 12:59:55 +00:00
ykhung
22e637bfc9
[S-QPR1] protect gettinng battery stats from DeadSystemException
...
In some corner cases, we will receive the DeadSystemException from
BatteryStatService when invoking getBatteryUsageStats() method, since it
will encounter the binder transaction too large error. Before the root
cause is resolved by the BatteryStatService team, we have to add
workaround protection in the app side to avoid Setting is crashed.
Bug: 191237968
Bug: 198084535
Test: make SettingsRoboTests
Change-Id: I783479241bac83b4afc8ced3073e1b1db302c48c
Merged-In: I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47
2021-09-27 09:57:41 +00:00
Daniel Solomon
5a02e48902
Update BrightnessInfo constructor usage
...
Bug: 200851199
Test: atest DisplayModeDirectorTest BrightnessLevelPreferenceControllerTest
Change-Id: I37593443b3d7eb314f8c4970711e4d4d6f39c6ea
2021-09-26 16:14:09 -07:00
Bill Yi
49ce6473d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7c1879f0724a02c587b898e68ef9161871561431
2021-09-26 04:38:29 +00:00
Bill Yi
fe3544e435
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: Ib81043858abd402fcc9e4b0cdfa856ca2a26b3ba
2021-09-26 04:35:06 +00:00
Bill Yi
92e5e1d54b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I116288a1e6ca78f8cd87f40b7a83de262b7b4449
2021-09-26 04:34:53 +00:00
Julia Reynolds
1aff9c726a
Always return the same result code in access screens
...
Regardless if the target package exists or not.
Test: Launch dnd and NLS screen with valid and invalid
packages; ensure the result code is the same for both
Bug: 195412179
Change-Id: I1bacd54c2971afb3733ca2f1462bcaabaada300b
2021-09-24 18:05:27 +00:00
Bill Yi
7e253fafe9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I2820410fc0de20dd6ec3b8fe2bb92dc593b6b3e7
2021-09-24 17:27:21 +00:00
Bill Yi
ee7f088a94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Id9ce6f1b5106c79de410fa563465ee026c1a17f2
2021-09-24 17:26:39 +00:00
Bill Yi
d43653e80d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-24 17:13:34 +00:00
Bill Yi
1b857d20ac
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
ffa2c65c22
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-24 17:10:56 +00:00
Bill Yi
6553465417
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
TreeHugger Robot
16ab663f53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: Ic29e3bfc8ee0d8837ea923f3a80f333a7578f9af
2021-09-24 17:01:46 +00:00