Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,183 Commits 1 Branch 0 Tags
4f200606a9760820ba216e3d802dbaf48024fa2c
Commit Graph

85183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
86a02e1e8e [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2618b4d77f7e8a98d2f376d94d93ca847e3aa2a1
 2021-10-06 19:20:09 +00:00
Weng Su
9ccd76cbde [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bea2e41caef5999d0a1920108edba991c63321c
 2021-10-06 19:20:08 +00:00
Weng Su
1f4b0eaa6f [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0e99006683e0bb1cdf51ac6a70794172319d53b
 2021-10-06 19:20:07 +00:00
Weng Su
f41979632a [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bdcc75fa22cd4cd5763075b5912c55d56914eb5
 2021-10-06 19:20:04 +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
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
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
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
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
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
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
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
Tim Peng
9e1455492b Phone fails to switch channel mode from stereo to mono 
-Set codec to SBC when HD audio is off

Bug: 194349060
Test: make -j50 RunSettingsRoboTests

Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
Merged-In: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
(cherry picked from commit 1469626b4a)
 2021-09-29 18:57:41 +00:00
Bill Yi
2c7cd22dee Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp 
* 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
Xin Li
dc818b7b1f [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I8efcd178648ac15b8a32e75f7481c5943af94af4
 2021-09-29 05:38:41 +00:00
Xin Li
8aa74d1ad4 Merge SP1A.210812.016 
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
 2021-09-28 19:39:58 +00:00
Xin Li
7a7b87716f DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15930864

Change-Id: I9ed0817f2ef9449e472476dfd5ed54b4e126bd5d
 2021-09-28 14:43:13 +00:00
Bill Yi
43b9cb669c [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: Iea597fedb4bf06eae6760f6d313bc8f7909f2077
 2021-09-28 09:01:34 +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
Xin Li
c41a577e37 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged 
Merged-In: Ibe8d1224361b31f6dfb782b5400d3ff6aad5e77f
Change-Id: I90b2538fb0737a35170b87864c776d94f575418f
 2021-09-28 07:55:18 +00:00
Bill Yi
7245d9f02a [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: I8aef99f96568cb302d895a18e5a1806da044701f
 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
Bill Yi
b01a8ddd0f [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: I1b040c3b7f9c49990ca50381233325f96db54357
 2021-09-24 17:25:53 +00:00
Bill Yi
17eccfd048 [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: I9ac01c58e94e4bc8e8a03400112049bc06cf0c01
 2021-09-24 17:25:28 +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
93e7956a7e Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp 
* 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