Weng Su
0cf0a56f4d
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
am: 973211dba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: I8bef2b924470482194232d1b5ac26b690dea286b
2021-10-08 07:36:30 +00:00
Weng Su
90f30c8eba
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
-s ours am: 77d30c4d0c
-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: I5a04f17a12ef5939b0d5bb70c8ae3b5bd3e6e268
2021-10-08 07:36:29 +00:00
Weng Su
6229244dac
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
am: 1400ff3139
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: Icc37fd645ae7e6ccf17873021e87ca76fbb0b134
2021-10-08 07:36:27 +00:00
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
ca721649c8
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432
Change-Id: I1b2cd3afdd506f14f0bb7f8f02299fc8b26116d9
2021-10-08 00:01:10 +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
d3de9d4b6c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Iad798b30be36844d9812501e49da3800115db0c9
2021-10-07 08:52:12 +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
579e48b03d
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: I25d658e8c82a1e45a69fdd3467309e897e10e8d5
2021-10-07 00:44:35 +00:00
Weng Su
18895edd6a
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: Idedd5323921e0cd646f34624a485dcbbb92d7a3e
2021-10-06 19:09:49 +00:00
Weng Su
be7746282d
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: f9e7a17247
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: If9b1ba5b239307f3f471d9a61e4a9279d3aa1d7c
2021-10-06 19:09:47 +00:00
Weng Su
5ef4ac6048
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: If64e864a38e2c68fb7da9e931b1dd14a82fff6e9
2021-10-06 19:09:46 +00:00
Weng Su
d6104f2e72
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I644814dfa7c696b1a7df4be6b061f1c6be21092d
2021-10-06 19:09:43 +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
cdf1cf85ee
Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev am: 396939a577
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15918324
Change-Id: I155b6358e1ebafe3128bbc8c52f71fe391236ce3
2021-10-05 23:00:43 +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
1f44763e81
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15976277
Change-Id: I00b1f3b12b11cabb628c10632fd6957ceedc410c
2021-10-05 07:49:00 +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
ce03913deb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962727
Change-Id: I2dea37dac41c682b9ed26e4f91e40e55a49fba7f
2021-10-02 06:43:06 +00:00
Bill Yi
c58566b623
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
am: 853fdb2f22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: I9681141c17e40d26b8125911133e413cf5c501f9
2021-10-02 06:42:59 +00:00
Bill Yi
c9920edd8e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
am: 7093e26067
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: I3ad7194b9b6159e101b87dc3f8ddd4ad7f1ddf95
2021-10-02 06:42:40 +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
7093e26067
[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: I26116054259653dcc9f68186b1a4a6bf0a13c393
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
6d4c35933c
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15952458
Change-Id: I5d3ee4751264b436a3e1bc9d9ff7f90037a92102
2021-10-01 23:44:05 +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
39fae9778c
Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434
Change-Id: I0e708bc4dd419c72389dafb51dadb240fa8a79e7
2021-10-01 18:17:16 +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
bed34d70fb
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ia0111381dc70bb1b4d73ff337fb2e303b52d8b48
2021-09-30 19:23:22 +00:00
TreeHugger Robot
f00be6bdfc
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: 9a573b1942
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Idd67e658def711bd9c63f24dfda05dedb989d795
2021-09-30 19:22:59 +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
9a573b1942
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: Id94319ec70f89a5f153d4e7f6db9ed2cba036997
2021-09-30 19:05:51 +00:00
TreeHugger Robot
a2e975064e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev
2021-09-30 18:51:47 +00:00
TreeHugger Robot
0db131b42b
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: I152a4223fbbf0ceaadfab992dc14bce46af763cd
2021-09-30 12:21:45 +00:00
TreeHugger Robot
7ba545d992
Merge "Fix USB tether option" into sc-qpr1-dev
2021-09-30 12:06:41 +00:00