PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,101 Commits 1 Branch 0 Tags
38c724f4f8a51a0c9a83f56ea4bc1fa1ac63846b
Commit Graph

61101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
56fb482acf Merge "Fix Passpoint network details privacy and ssid" into rvc-dev 2020-03-25 01:04:47 +00:00
Rahul Sabnis
5bce75f0fb Verify BluetoothDevice is not null before calling BluetoothHearingAid 
System APIs

Bug: 149238489
Test: Manual
Change-Id: Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b
 2020-03-24 18:03:13 -07:00
Philip P. Moltmann
e59daf3ef3 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 
Change-Id: Id581c03843fdad4d3c083ffa59cd4b7e5e732582
 2020-03-25 00:08:36 +00:00
Philip P. Moltmann
6f8310ec88 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 74be567166 
Change-Id: I53cef5fcbde7e24b00f94831350357050ce01103
 2020-03-25 00:08:20 +00:00
Automerger Merge Worker
4ee8a227a1 Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583" into rvc-d1-dev-plus-aosp 2020-03-25 00:08:10 +00:00
TreeHugger Robot
a3848257dd Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 
Change-Id: I641d1a2119f6e4748515774d57d0a2f1cfa01be5
 2020-03-25 00:07:59 +00:00
TreeHugger Robot
adce5a2ec1 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d 
Change-Id: I2478aacd60522ad19983c023d37965bc2cb71116
 2020-03-25 00:07:58 +00:00
Philip P. Moltmann
64d9d6eb15 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e 
Change-Id: I978b101a36a251d9428dd2d17711d30511c6f2b9
 2020-03-25 00:01:04 +00:00
Philip P. Moltmann
74be567166 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e 
Change-Id: I1c30cfefbcdaa08e715b17b262e42a9c7448b3b8
 2020-03-25 00:01:04 +00:00
Philip P. Moltmann
7443e3de6e Merge "Send attributionTag to notification APIs" into rvc-dev 2020-03-24 23:53:51 +00:00
TreeHugger Robot
558095e583 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 
Change-Id: I4a4e9d0ef55b07cee0207e73dba1b577d8aa1bc9
 2020-03-24 23:48:40 +00:00
TreeHugger Robot
d169749e7d Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 
Change-Id: I2fb1ee5ab5f737660676b27062b89329e9cedf81
 2020-03-24 23:47:44 +00:00
TreeHugger Robot
d227755be8 Merge "[Settings] Avoid from Settings crash" into rvc-dev 2020-03-24 23:32:34 +00:00
Philip P. Moltmann
12954d5060 Only check op in Settings UI 
noteOp should only used if the data protected by the app-op was
accessed. If you only want to know the state, use checkOp.

Test: TH
Bug: 136595429
Change-Id: I2b53ad413c10a71feb9c94848aef2f9f38f851d8
 2020-03-24 15:55:57 -07:00
Julia Reynolds
2c0fbbde8c Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f 
Change-Id: Id63a9f0dae4739a0464e00881e1fd4cea9c1ebb6
 2020-03-24 21:59:41 +00:00
Bonian Chen
dcf701efc3 [Settings] Avoid from Settings crash 
Avoid from crash when null pointer.

Bug: 152336444
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I77314f697d8a99d77b9f5fe0a48ddbae69634743
 2020-03-25 05:48:37 +08:00
Julia Reynolds
cff74feef2 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 
Change-Id: I94ef7a1ea9ab9742f2dadd5c057a82e866cb8f10
 2020-03-24 21:43:34 +00:00
Julia Reynolds
6104923f21 Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: f611025053 
Change-Id: If414a68d3c1f058d2e208534c74906bad47556e2
 2020-03-24 21:43:15 +00:00
Julia Reynolds
941d437df6 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd 
Change-Id: I065eb16003c13ed562242e1d9d2eb5deb6870415
 2020-03-24 21:42:44 +00:00
Julia Reynolds
b5d726003f Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd 
Change-Id: Icf2ce73480b62fb1853e0798b890cfbcbccc0191
 2020-03-24 21:42:03 +00:00
Julia Reynolds
79fd5811cd Merge "Update all conversations screen" into rvc-dev 2020-03-24 21:33:53 +00:00
Julia Reynolds
7cad4c67df Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 
Change-Id: Iddede304e44b2526287d15a56acda47420855532
 2020-03-24 21:25:51 +00:00
Julia Reynolds
f611025053 Merge "Notification history updates" into rvc-dev am: 8d3741fbca 
Change-Id: Ia281dc883825831c64e9f12b2b5c82e42333e047
 2020-03-24 21:17:27 +00:00
Julia Reynolds
31f9705a60 Merge "Notification history updates" into rvc-dev am: 8d3741fbca 
Change-Id: If1386c89f4e0e90c84d57950351509c2b9a4173f
 2020-03-24 21:16:41 +00:00
Julia Reynolds
8d3741fbca Merge "Notification history updates" into rvc-dev 2020-03-24 21:07:35 +00:00
Julia Reynolds
2f0bd6552c Update all conversations screen 
Update text, and filter the lower section to match the new
header

Test: atest
Fixes: 151765526
Change-Id: I5bc052813745908df8602bf397434a76b294ba6c
 2020-03-24 19:37:13 +00:00
Philip P. Moltmann
288491c724 Send attributionTag to notification APIs 
Test: TH
Bug: 136595429
Change-Id: I4a5bb43a4aa5bfd88646771a0d1a2394d40e82e2
 2020-03-24 11:46:48 -07:00
Lais Andrade
5695b43077 Add help uri placeholder for vibration settings 
Fixes: 150915047
Test: manual
Change-Id: I69d26298d953f28639925c45999518a44881a657
 2020-03-24 17:21:11 +00:00
Julia Reynolds
8222a9a650 Notification history updates 
- New strings
- Fix a crash

Test: manual
Fixes: 151833727
Change-Id: I3b0ef5cd9b221be917c71043e5217a43bc5891d0
 2020-03-24 09:25:58 -04:00
Automerger Merge Worker
0aec76e8ef Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp 2020-03-24 12:49:51 +00:00
TreeHugger Robot
59f6f58fb5 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5 
Change-Id: Id7bf4ef08d686fac188855f200b361ce5b86f0d0
 2020-03-24 12:49:47 +00:00
TreeHugger Robot
8247c93340 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd 
Change-Id: I3f58f0252146a954d4d14a9b40e5cd12b50c496b
 2020-03-24 12:49:41 +00:00
TreeHugger Robot
168fe82aa5 Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 
Change-Id: Ie80135ad3fe7078fee32de117e2c543e7c3de83a
 2020-03-24 12:36:43 +00:00
TreeHugger Robot
875b0df3dd Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 
Change-Id: Ie3f31d838d91cf051524e81f1cac87dec0d84add
 2020-03-24 12:35:56 +00:00
TreeHugger Robot
87c0179c01 Merge "Re-enable ignored tests" into rvc-dev 2020-03-24 12:22:11 +00:00
Automerger Merge Worker
1c4765f6ee Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp 2020-03-24 10:57:38 +00:00
Ben Murdoch
55ee7603e5 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 
Change-Id: I199ea1ad09f5aaef63ffc9312d058a5c452e53d5
 2020-03-24 10:57:28 +00:00
Ben Murdoch
cdcf827947 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 
Change-Id: I6fec6b405557e9ad69ff875e890591be9a6d8d02
 2020-03-24 10:57:24 +00:00
Ben Murdoch
7b2154d996 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 
Change-Id: I4a67e3a9d94d63f0cc9cb6942acabd1e9c32b936
 2020-03-24 10:45:49 +00:00
Ben Murdoch
63aded6f67 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 
Change-Id: I822c63ede7d0f92dbfe724731350fc140db88ef5
 2020-03-24 10:45:25 +00:00
Ben Murdoch
7afced3599 Merge "Move strings related to user creation to SettingsLib." into rvc-dev 2020-03-24 10:25:21 +00:00
Zoey Chen
03e57ffd43 [automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours 
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f is in history

Change-Id: I5b266f4a55981afc9f1ebf2da326e6edcea4a783
 2020-03-24 09:33:33 +00:00
Zoey Chen
c79289a585 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 
Change-Id: I26dda4b26362bb94c48e1ad439af536d0353df16
 2020-03-24 09:33:08 +00:00
SongFerngWang
a043c5a7ad Fix the NetworkScanHelperTest testcase. 
To fix the NetworkScanHelperTest testcase, becasue mainline cause
the testcase fail.

Bug: 147464840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkScanHelperTest
Change-Id: I2992606dd082d2b87e047beacd9cf1c26790f450
 2020-03-24 17:16:51 +08:00
Zoey Chen
c1f1682fbf Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 
Change-Id: I2cf40657d94d445a3582f7b64f6e02dbf8e77aa2
 2020-03-24 09:16:42 +00:00
Zoey Chen
2a0dd6f700 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 
Change-Id: I75a262c21d215f8669c81056b581c5ffd734accb
 2020-03-24 09:16:28 +00:00
Zoey Chen
61b66a28d9 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev 2020-03-24 09:05:00 +00:00
Automerger Merge Worker
5616f7632b Merge "Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2" into rvc-d1-dev-plus-aosp 2020-03-24 08:08:32 +00:00
Arc Wang
b09f4e3d15 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: f47f38c9a2 
Change-Id: I8589a73f1896b121ef5800159af5077e907bfa79
 2020-03-24 08:08:28 +00:00
Arc Wang
660cacfa0d Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63 
Change-Id: I9382e4559375d0d77ad206e22e11e3803d829891
 2020-03-24 08:08:26 +00:00