PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,919 Commits 1 Branch 0 Tags
a5f3b1142a76d450cfecd7916ff3d1b0ecb569ab
Commit Graph

59919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
a5f3b1142a Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e 
Change-Id: I8716a9f9e5009e6ed9d6072713e847368fbbdc77
 2020-03-20 11:15:46 +00:00
Bonian Chen
b6ff3cf826 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf 
Change-Id: I9f0ec77cdf231f81e7113fe2a033d4ed07ab94d6
 2020-03-20 11:15:40 +00:00
Bonian Chen
1eb4c78a0e Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 
Change-Id: I15302d3dba68d4473a1e8204c947e13f13f1b346
 2020-03-20 11:01:38 +00:00
Bonian Chen
fc9bdd1fdf Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e 
Change-Id: Ic2c5c2d409176de58ba54dce107b5f94195c4c64
 2020-03-20 11:01:30 +00:00
Bonian Chen
26fb6c29c1 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev 2020-03-20 10:52:38 +00:00
Bonian Chen
06899ffb8e Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev 2020-03-20 10:48:03 +00:00
Bonian Chen
594c267e99 [Settings] mSubId should not be overridden in 
TelephonyBasePreferenceController

mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.

Bug: 150535296
Test: manual
Change-Id: I391b034c9badd43094ab52b8b6488bca07ef3c86
 2020-03-20 10:46:52 +00:00
TreeHugger Robot
db153cfede Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc 
Change-Id: Ic4a9281f40db77b91878fbf6deaaf4869fadc83c
 2020-03-20 06:42:41 +00:00
TreeHugger Robot
ea1c86bfdc Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 
Change-Id: Iaae4b0e5953fc8846450703809185136db28e3d1
 2020-03-20 06:24:34 +00:00
TreeHugger Robot
750ff89856 Merge "Update the icon of security IA." into rvc-dev 2020-03-20 06:11:06 +00:00
Bonian Chen
4a49f426fb [Settings] Avoid from accessing IMS with invalid subscription id 
Check subscription ID before accessing to IMS APIs

Bug: 149190278
Test: make and manual test
Change-Id: I0561529ccaf23c84d7d6dd3e268386ab82f17418
 2020-03-20 13:31:35 +08:00
Daniel Bright
940de2cb19 Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 
Change-Id: I09163a0c1da1169c88352a943684b4d7c8a52027
 2020-03-20 05:29:44 +00:00
Daniel Bright
aaf82799c7 Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 
Change-Id: I334f1df41065c05683484e9f04b68d285b46b7f5
 2020-03-20 05:16:31 +00:00
Daniel Bright
d46bf256b9 Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 
Change-Id: I156e9bfc666975228e9eae6e641fb3c8739f9118
 2020-03-20 05:09:19 +00:00
Sooraj Sasindran
5d42a76fcd Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d 
Change-Id: I2bb5796b7c181d68a8c1d6a4cba3201162930a02
 2020-03-20 05:09:17 +00:00
Goven Liu
bb21d59c96 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 
Change-Id: I9bafbacf24f2d26446e043fcc9952dde9eaaa6ba
 2020-03-20 05:08:58 +00:00
Daniel Bright
da2fe00a04 Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f 
Change-Id: Ifb96ebf14d46e5c07a3cc7b96bb067f55b129b3f
 2020-03-20 05:02:02 +00:00
Sooraj Sasindran
2628af114d Revert "access system resources with android.R package" am: 253ba4f3ef 
Change-Id: Idf5eee8350df4aaa7ea37f85677b315b35c56028
 2020-03-20 05:01:58 +00:00
Daniel Bright
b5e5aa9ef2 Merge "Revert "access system resources with android.R package"" into rvc-dev 2020-03-20 04:57:43 +00:00
Daniel Bright
6249dfbd9f Merge "Revert "access system resources with android.R package"" into rvc-dev 2020-03-20 04:57:43 +00:00
Goven Liu
a3e9660230 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 
Change-Id: I35f128811a9d4e480ada35a99f1fa4b90c243834
 2020-03-20 04:56:52 +00:00
Goven Liu
b626a602c9 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev 2020-03-20 04:54:46 +00:00
TreeHugger Robot
1bea826cad Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918 
Change-Id: If87953e41319b8660dab392f339092c30ce7f6f6
 2020-03-20 04:13:50 +00:00
TreeHugger Robot
bf82eab918 Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb 
Change-Id: Idb9f81cf4621e1d62fa182bdfafbfdb105390ff8
 2020-03-20 04:01:46 +00:00
TreeHugger Robot
779a069520 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: e04ffe1aa1 -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: If21132afaf33cb00d178be19fa63b4d1b3951866
 2020-03-20 03:43:31 +00:00
TreeHugger Robot
b33c16cacb Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev 2020-03-20 03:40:00 +00:00
Yi-Ling Chuang
d44ceb95cc Update the icon of security IA. 
Fixes: 140556928
Test: rebuild and check the icon on the homepage
Change-Id: I211ea9f57910943a75d8a98c6d88ce99018debfe
 2020-03-20 11:36:18 +08:00
TreeHugger Robot
e04ffe1aa1 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: Id0c124c57c782835535df26c5eee251af97dd12b
 2020-03-20 03:30:26 +00:00
TreeHugger Robot
dc1f295a59 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I279a6e1584a26219a1b3b26a0054ebb9728b498e
 2020-03-20 03:19:10 +00:00
TreeHugger Robot
3c137d807d Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev 2020-03-20 02:51:54 +00:00
TreeHugger Robot
e3e2309149 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 23df2cf9c9 
Change-Id: I88956b7fca1e11e434b3f19cf8b29c313834e220
 2020-03-20 02:38:48 +00:00
TreeHugger Robot
23df2cf9c9 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 
Change-Id: Ic0b09f6cd825e413e87b06434bfdeb65e66225c3
 2020-03-20 02:18:53 +00:00
Sooraj Sasindran
3e26fc0f21 Revert "access system resources with android.R package" 
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
 2020-03-20 01:37:47 +00:00
Sooraj Sasindran
253ba4f3ef Revert "access system resources with android.R package" 
Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
Idc1095563:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I1e698d404:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: I1e370f0eadce02508b0a16e01e51c4ac5b002ac9
 2020-03-20 01:37:30 +00:00
TreeHugger Robot
b436d149e4 Merge "Update string for Adaptive sleep slice title." into rvc-dev 2020-03-20 01:16:53 +00:00
TreeHugger Robot
221d385fea Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 70215248d1 
Change-Id: I122499b6d4bccf7ece08039abc02a1a5dedc9e9a
 2020-03-20 01:09:41 +00:00
TreeHugger Robot
70215248d1 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 
Change-Id: I5c210eec0fe7d89e8117ea5c21d4656e42cba522
 2020-03-20 00:51:01 +00:00
TreeHugger Robot
db468353e0 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev 2020-03-20 00:41:34 +00:00
govenliu
907e402cfa [Wi-Fi] Add API to handle help button click event 
Add API to launch help page when Openroaming help button is tapped.

Bug: 146669261
Test: Add openSubscriptionHelpPage_shouldCallStartActivityForResult unit test to check StartActivityForResult had been launched correctly.
Change-Id: If18248e7d985215e65dfdc5742cd9007efbbff1a
 2020-03-19 23:22:36 +00:00
TreeHugger Robot
a10b01df8b Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 123fcc61f7 
Change-Id: I31a2dfcd7e45e9f1199e4d66a3f4cc5814b371bc
 2020-03-19 22:58:15 +00:00
TreeHugger Robot
ab6d1522de Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 2fac4fae3a 
Change-Id: Id607570b46bf2a16435955b9dbe9cc3d57cb40f8
 2020-03-19 22:57:20 +00:00
TreeHugger Robot
123fcc61f7 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f 
Change-Id: I73daeb7b347a75ca9ba17150ccb0e1d15d158872
 2020-03-19 22:48:32 +00:00
TreeHugger Robot
2fac4fae3a Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 
Change-Id: I3cb785619efbd09712a60a3a1b02cb1265ad7748
 2020-03-19 22:47:27 +00:00
Yi Jiang
80d0fa1c5e Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest 
Bug: 139319542
Test: atest ContextualAdaptiveSleepSliceTest
Change-Id: Ie10e8c06382594fe417d9d495b8b071afb717723
 2020-03-19 15:39:34 -07:00
TreeHugger Robot
c4fd9b8d6f Merge "Add strings for the install app banner in cross profile settings" into rvc-dev 2020-03-19 22:39:31 +00:00
TreeHugger Robot
7be978cd84 Merge "Settings strings for bubbles" into rvc-dev 2020-03-19 22:37:11 +00:00
Brad Ebinger
de2ffe1f16 Change to Contact Discovery Dialog Language based on Privacy Feedback 
Bug: 141950843
Test: verify text
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
 2020-03-19 15:26:25 -07:00
TreeHugger Robot
64856e8dee Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416 
Change-Id: I50a57b2854dbc3da9422e685d5a6714474204d90
 2020-03-19 22:12:12 +00:00
TreeHugger Robot
a94808e416 Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e 
Change-Id: I20b328855032254efc862de8b7fe46f2b78e09fb
 2020-03-19 22:11:21 +00:00
TreeHugger Robot
691aa7a05e Merge "Change cross profile settings page title" into rvc-dev 2020-03-19 22:03:22 +00:00