Commit Graph

85921 Commits

Author SHA1 Message Date
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
Weng Su
aed1ab9e45 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 4fb84a3737 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167

Change-Id: I3ee28caa937081f910aeb361e3dac5a913de74c7
2021-10-06 19:09:37 +00:00
Weng Su
f05b8fbb79 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207911

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166

Change-Id: I769f3d5a15c1ee8bf7d4497f46c41e22dc2cc9e1
2021-10-06 19:09:36 +00:00
Weng Su
395ac6073c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 4fb84a3737 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167

Change-Id: Ie68ac2947f392a8046c2f62d9c357c852493eb2b
2021-10-06 19:08:50 +00:00
Weng Su
d5ff68889c [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207911

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166

Change-Id: I18755f444c82aa7f3241812a1f51e0e06c009c07
2021-10-06 19:08:49 +00:00
Weng Su
1b732ee4cb [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: Ibe7ee7e46ef2568608ab98781b2795d8b6216bbb
2021-10-06 19:08:27 +00:00
Weng Su
36558d2c6c [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620

Change-Id: I2328f01474382bf74a445cddf8d110bb4ce7ac58
2021-10-06 19:08:25 +00:00
Weng Su
372e90064b [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: I671a389457ed8500ebe4aa41fbbda42b6604094c
2021-10-06 19:08:22 +00:00
Weng Su
2fe0d45ab8 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I82807875c1087f54e7c6701ea3cb7e73af9b0352
2021-10-06 19:05:00 +00:00
Weng Su
0fe85baf93 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I1060479460cccc4e5e827b3687d3aaa214311ea5
2021-10-06 19:04:59 +00:00
Weng Su
cbd0883356 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: I74316633648d6a5002433440358b9a0a443b3cf8
2021-10-06 19:04:58 +00:00
Weng Su
457a63ce84 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: I90af118b9033a7ee53b35aa2b435d2ba95281181
2021-10-06 19:04:56 +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
Chen Chen
31b15330c4 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:53:07 +00:00
Chen Chen
e5ccfba996 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:52:44 +00:00
Chen Chen
65a63e76b1 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:52:10 +00:00
Chen Chen
aebca7f35b BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:50:23 +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
Weng Su
ed4abe8483 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev 2021-10-06 18:47:52 +00:00
Weng Su
259742ebb2 Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev
* changes:
  [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
  [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging"
2021-10-06 18:47:52 +00:00
Weng Su
3678155f90 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev 2021-10-06 18:47:29 +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
Android Build Coastguard Worker
c60e5b3c3d Snap for 7796451 from 396939a577 to sc-qpr1-release
Change-Id: I4944f2b52b43dddb2bb79f1bfd5b6198c89aa4c5
2021-10-06 01:08:28 +00:00
Chen Chen
f8d1ee71bf BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-05 17:46:15 -07: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
Weng Su
18043562c1 [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
Revert submission 15207347-add_permission_wifidialog

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging

Bug: 185126813
Change-Id: Ifc3b53dc91fc8d5aa31c1a10d4eb033bbe54c47d
2021-10-05 06:47:46 +00:00
Weng Su
6a2624e500 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
Revert submission 15220072-add_permission_wifidialog-qt-dev

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
I1535f6f2d:Add SafetyNet logging
If7ca069c8:Add permission checking to WifiDialogActivity

Bug: 185126813
Change-Id: I3f75adf5bf0eea037dc0c5dfbeeb22b35b2856b6
2021-10-05 03:37:51 +00:00
Weng Su
1c93d29b73 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit fa1e3870d8.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I77a027075465b5685a857b4c8c68203ef812a172
2021-10-05 03:25:13 +00:00
Weng Su
12dcd5034a [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging"
Revert submission 15207347-add_permission_wifidialog

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging

Bug: 185126813
Change-Id: I41721dbb34612144d00dba7885944d834bf93c7d
2021-10-05 03:24:34 +00:00
Weng Su
153b0f03f5 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 4fb84a3737.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I495cd723917db6405ef3b540a6f01eaeaf8a45fe
2021-10-05 03:24:14 +00:00
Weng Su
d05686b431 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
Revert submission 15220072-add_permission_wifidialog-qt-dev

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
I1535f6f2d:Add SafetyNet logging
If7ca069c8:Add permission checking to WifiDialogActivity

Bug: 185126813
Change-Id: I42b77ac420d9438c741b28ce33bcadf1c74b19eb
2021-10-05 03:23:45 +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
Android Build Coastguard Worker
952be74d21 Snap for 7788786 from da8e9c1108 to sc-qpr1-release
Change-Id: I6e2c644a089e6d5ef071ec62db50e465a72d70a3
2021-10-02 23:08:10 +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
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
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
Android Build Coastguard Worker
80fb501dea Snap for 7787524 from 468bad73d7 to sc-qpr1-release
Change-Id: I696da9741d9902cee3f73ba8e20a7db24085a973
2021-10-02 03:08:24 +00:00