Jiun-Yang Hsu
1e2386b14b
Merge "Create folder and OWNERS file for component test" am: cf231cad93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60949e540697933fb138ab9d42d28657474cf136
2021-01-29 23:21:55 +00:00
Jiun-Yang Hsu
cf231cad93
Merge "Create folder and OWNERS file for component test"
2021-01-29 12:48:32 +00:00
Jiun-Yang Hsu
2d0baa2c27
Create folder and OWNERS file for component test
...
Test: No test needed for creating folder and OWNERS
Change-Id: I6b1aff581df36a9c70309df2f2ce30d547a820d5
2021-01-29 09:01:30 +00:00
Peter Wang
b4f375fdc4
Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia9cd23da0ae90f7f5c38fae54900b30e7ca12bad
2021-01-27 22:03:32 +00:00
Peter Wang
ffccb8a611
Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA"
2021-01-27 21:39:51 +00:00
Yo Chiang
7ac7030d49
Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I141aeae1f09a535aad5084f335c6ecbed696bfde
2021-01-26 11:34:53 +00:00
Yo Chiang
df58c6505d
Merge "Remove feature flag "settings_dynamic_system""
2021-01-26 10:53:54 +00:00
Peter Wang
7e8d24e073
Add an intent filter for MobileNetworkListActivity to enable access
...
from the LPA
Bug: 170507492
Test: Local
Change-Id: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
Merged-In: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
2021-01-19 22:21:45 -08:00
Yo Chiang
f1065e359f
Remove feature flag "settings_dynamic_system"
...
Bug: 176795908
Test: Presubmit
Test: DSULoader
Change-Id: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
Merged-In: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
2021-01-14 15:47:41 +08:00
Benjamin Franz
9229794727
Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4946065f619aac04cf681c310bfe04a6e5e68099
2021-01-12 16:22:18 +00:00
Benjamin Franz
39a920dd22
Merge "Update constructor usage for CompatibilityChangeInfo"
2021-01-12 15:38:01 +00:00
Treehugger Robot
8c2b2cc806
Merge "Fix too many receivers Exception" am: 2e6cde6b94
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id69d676c8386f74a7e642984ea7387baacd2711c
2021-01-08 09:22:52 +00:00
Treehugger Robot
2e6cde6b94
Merge "Fix too many receivers Exception"
2021-01-08 05:35:46 +00:00
Benjamin Franz
92480fc15d
Update constructor usage for CompatibilityChangeInfo
...
As we're introducing an overridable flag on CompatibilityChangeInfo, the
constructor takes an additional argument that needs to be reflected in
these tests.
Bug: 174043039
Test: atest SettingsRoboTests
Change-Id: Ib5528ded408cb7807e2e3a90e1f99ee1775d566d
2021-01-06 15:12:50 +00:00
Treehugger Robot
8677c6a4b7
Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4f151b07b92e0c55a53b38216024858b9fd68ce
2021-01-06 04:57:58 +00:00
Treehugger Robot
d3d0962cd1
Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default"
2021-01-06 04:24:25 +00:00
Jason Jeremy Iman
620158be52
[adb-wireless] Allow ADB-over-WiFi when WiFi is not default
...
When other network types with higher priority than wifi is
connected alongside wifi, turning on ADB over wifi is not
possible.
This is happening due to `isWifiConnected()` only checks
if wifi is the default network and not if wifi is connected.
Often times multiple networks such as ethernet is used in
conjuction with wifi, making ADB over wifi not working with
the setup.
Fix by returning if any available network is a WiFi network.
Bug: 173466085
Test: Tested on eve Chrome OS ARCVM, ADB WiFi can be toggled when
WiFi is not the default network.
Change-Id: I8474a4e8b37a4af0031e1462645509f1e634e9a8
2021-01-06 11:00:03 +09:00
TreeHugger Robot
d2a2867d85
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2021-01-03 05:10:18 +00:00
Bill Yi
88409f1af9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I838570051ce2aab9c2b98fb2bf738a06b7687893
2021-01-02 22:27:59 +00:00
Bill Yi
783c18d8a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibc84cbad5cb80898de5f771c8e1defd43122d694
2021-01-02 21:59:25 +00:00
Treehugger Robot
aae7ce1b1c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64108906b14421f342bb5418d800a4b639a43708
2021-01-02 03:33:25 +00:00
Treehugger Robot
ed32f93dbd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a22c4edab65206bd4441d791c19fda687276057
2021-01-02 03:33:06 +00:00
Treehugger Robot
30364048ce
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-02 03:14:44 +00:00
Treehugger Robot
f89dd1307c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-02 03:14:05 +00:00
Bill Yi
3e0563138f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I31a8c787f06f10c5c985268ea2652dff6d3161ff
2021-01-01 22:26:03 +00:00
Bill Yi
028d6f33b5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib1f949c9281dc4a209ff3ccd84f74423fd92ebb6
2021-01-01 21:57:18 +00:00
Amber Ogata
ac0f1fc20c
Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I424f31e085814e4afd0b92d3295d25301febf5ca
2020-12-29 17:29:57 +00:00
Amber Ogata
4de1ae6a45
Merge "Add intent filter to open premium sms setting."
2020-12-29 17:01:04 +00:00
Treehugger Robot
defe0a6b9f
Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e57028b2b4cabaa7bd9aaac6a134b54af5b3116
2020-12-29 08:57:36 +00:00
Treehugger Robot
a1716edbb6
Merge "hardwareinfo: Hide hardware revision if empty"
2020-12-29 08:21:35 +00:00
Treehugger Robot
6873e19485
Merge "Settings observer fail to unregister." am: b92cb6678c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f67c00a5fbb23594a527d0a8d77b9617b635a18
2020-12-29 05:38:14 +00:00
Treehugger Robot
b92cb6678c
Merge "Settings observer fail to unregister."
2020-12-29 05:26:12 +00:00
Amber Ogata
9d5de29fcc
Add intent filter to open premium sms setting.
...
Test: adb shell am start -a android.settings.PREMIUM_SMS_SETTINGS -d package: com.android.settings
Bug: b/175911991
Change-Id: I1b48494d8d388ad52c5966dbd1e89b1a6f9c6785
2020-12-29 01:19:58 +00:00
Chiachang Wang
85b853725d
Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26de8a5227ecaa4ede80a9154ffa5078b4fb293e
2020-12-29 00:47:18 +00:00
Chiachang Wang
6aef579198
Merge "Update getMobileProvisioningUrl to telephony surface"
2020-12-29 00:24:12 +00:00
andrew.gong
bf477db855
Settings observer fail to unregister.
...
Zen mode change will call displayPreference() and create a new SettingsObserver, then the old Observer object will have no opportunity to be unregistered. After too much new SettingsObserver creatd in Monkey test, memory might leak.
Bug 176206489
Change-Id: I3bccec281da492299bbf755f86df7844a31223c5
2020-12-24 15:57:09 +08:00
Chiachang Wang
195a75e47e
Update getMobileProvisioningUrl to telephony surface
...
ConnectivityService is going to become mainline and can not
access hidden APIs. The mobile provisioning url is used by
telephony and it will use the hidden xml parsing APIs. It also
would make more sense to have the parsing inside telephony code.
Thus, move getMobileProvisioningUrl parsing to telephony surface
from ConnectivitySerivce and update the corresponding callers.
Bug: 175177794
Test: m and verify the url could be read successfully from the
telephony surface
Change-Id: Ie8b46bc9b652f926277b10e36a86adba4dbd0121
2020-12-23 02:06:24 +00:00
Remi NGUYEN VAN
1a57bfefb2
Merge "Replace isWeaklyValidatedHostname with guava" am: 5cadac06b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512667
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4fcb69612607a4375695664062f0bd891fc927ce
2020-12-23 01:37:12 +00:00
Remi NGUYEN VAN
5cadac06b9
Merge "Replace isWeaklyValidatedHostname with guava"
2020-12-23 01:19:27 +00:00
Allen Su
3d9ede1815
Merge "Change carrier config" am: ba38382627
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ffdb49ee1dde44fd272632086c75963dffaed27
2020-12-22 01:04:35 +00:00
Allen Su
ba38382627
Merge "Change carrier config"
2020-12-22 00:26:52 +00:00
Treehugger Robot
892c868c32
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1534258
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica30d902800493f8a4f5d36365de2d4dca8e77b7
2020-12-20 19:11:29 +00:00
Treehugger Robot
b5a0cf9253
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1534238
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17af19488236d2b4376dc523c06c5ea27c67b616
2020-12-20 19:07:31 +00:00
Treehugger Robot
3d0be7ca05
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-20 18:43:29 +00:00
Treehugger Robot
5ae81b2084
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-20 18:38:59 +00:00
Bill Yi
cb8819b42f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If6d96e565647fb0bbbc643834aebb719fbc2d843
2020-12-20 12:41:07 +00:00
Bill Yi
c741c74967
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia7493562157c18c8a1ad4295d310a33400d90b20
2020-12-20 12:14:03 +00:00
Jeremy Goldman
2b1b458f1a
Merge "Owners updates" am: 59465ee9d3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2de2ba79486a4ec7df4962ca22ea21162c9f7ba3
2020-12-17 12:59:18 +00:00
Jeremy Goldman
59465ee9d3
Merge "Owners updates"
2020-12-17 12:24:01 +00:00
Xiangyu/Malcolm Chen
04d95b6e8e
Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d44
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531286
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I37c0f54c42db2ba1338238d6477a2e3b88c20e85
2020-12-16 19:30:17 +00:00