PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,507 Commits 1 Branch 0 Tags
21cea68a243577b647e84d4cbb5ddb2bbddb7eb2
Commit Graph

71507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
21cea68a24 [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours 
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4a3153c551d622287caed126207c367a8427c0d
 2021-02-04 18:19:16 +00:00
Bill Yi
0e0360963a Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" 2021-02-04 17:08:42 +00:00
Treehugger Robot
14993282f1 Merge "[Settings] Add owner into Settings/network" am: 18b440997f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cd2673f9d2daea6de8c3329172e1f65590a03e1
 2021-02-04 08:26:11 +00:00
Treehugger Robot
18b440997f Merge "[Settings] Add owner into Settings/network" 2021-02-04 08:01:46 +00:00
Zoey Chen
f74551eb47 [Settings] Add owner into Settings/network 
Bug: None
Test: Not required
Change-Id: I7cc22c9455f4f074c1e22dd27e1f9cb4028376a8
 2021-02-04 13:11:04 +08:00
Bill Yi
0f8ac7d168 Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE 
Merged-In: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
Merged-In: I402b212594a9e9f4c118d94008f53177d3430361
Change-Id: I19cd6d4c1152270a8936d7a9b999c870415f4221
 2021-02-03 17:01:33 -08:00
Aaron Huang
3178dfc76a Merge "Replace @hide API with public API" am: d52cff9b57 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a7897d737557abe1b7ede7f3931b2798e9610ab
 2021-02-03 08:30:43 +00:00
Aaron Huang
d52cff9b57 Merge "Replace @hide API with public API" 2021-02-03 07:37:33 +00:00
Bill Yi
3e1fb17420 Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE 
Merged-In: Ia1d85c7136b824e69077ea06c68d142a706c2b11
Change-Id: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
 2021-02-02 09:44:11 -08:00
Aaron Huang
3bb961affd Replace @hide API with public API 
ProxyInfo is inculded in framework-connectivity module
which should not have external dependencies on its hidden API.
Thus, migrate getExclusionListAsString to getExclusionList.

Bug: 178777253
Test: build
Change-Id: I64b9d5be062bec43c7be3ea68d1f63054319df2d

Change-Id: I400df793fc669d0e574fb4cf022d021d99859d53
 2021-02-01 19:16:23 +08:00
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