TreeHugger Robot
3a9efed4ef
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb
...
Change-Id: I1eb8c117d3226c25d50f33100ec434f38923aec5
2020-03-20 11:43:57 +00:00
TreeHugger Robot
a5a629c7fb
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev
2020-03-20 11:28:18 +00:00
Junyu Lai
8a293f07e0
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721
...
Change-Id: I7c62fbdc6177cfc4f32c221d413e73c9efe667d5
2020-03-20 11:08:58 +00:00
Junyu Lai
040bfe3721
Merge "Adjust code for API council feedback" into rvc-dev
2020-03-20 11:03:47 +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
Peter_Liang
41f536df13
Revise strings to up to date for tutorial improvement.
...
Bug: 148989018
Test: manual test
Change-Id: If6691f36277fa13b89f6305864fad30152a3cda9
2020-03-20 15:22:30 +08: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
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
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
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
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
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
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
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
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
Michael Groover
44c041651b
Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
...
Change-Id: Ic0a0fb5ea9c1e75168bb3ea75d620de2ec1da42f
2020-03-19 21:36:20 +00:00
Varun Anand
742cec9ad4
Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
...
Change-Id: I3d474eaef339d445550f6d8a7bf99a01123deba0
2020-03-19 21:36:13 +00:00
Michael Groover
0a189b3abe
Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev
2020-03-19 21:31:01 +00:00
Varun Anand
4ebfaec3a3
Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev
2020-03-19 21:21:22 +00:00
Hall Liu
f5e8d0662a
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
...
Change-Id: I5493831165ec966b30221669bd3d154a880271e5
2020-03-19 21:08:47 +00:00
Hall Liu
64e48c2061
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev
2020-03-19 21:06:54 +00:00
Peter Wang
13dd87a9b8
Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
...
Change-Id: Iac656249241c2b5fe3c74f9accfc84b7195cc153
2020-03-19 20:29:16 +00:00
Mady Mellor
1f54e84c3c
Settings strings for bubbles
...
To be used in a follow up..
Test: treehugger
Bug: 151965589
Change-Id: I1a285d0eb827eed33d9dcca2ec6e2be2ef098185
2020-03-19 13:16:36 -07:00
Peter Wang
6c95bb5cf6
Merge "[API Review] APIs in SubscriptionManager" into rvc-dev
2020-03-19 20:07:39 +00:00