PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
144,488 Commits 1 Branch 0 Tags
c87fd1a92f5ed19a79aa497d1e35d352a504cee4
Commit Graph

73 Commits

Author SHA1 Message Date
Diego Vela
afdf5ed0d4 Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb am: 25ee8c7cf0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6db438a43e58f0ee0df43c12cb1db69ed1ae218d
 2020-12-14 22:56:14 +00:00
Diego Vela
ed5986c335 Merge "Revert "Add <uses-library> information."" am: 54b741096b am: 9d61c8a23d am: acba236677 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief413bfbeadd5c47529d7dade9dad7e365d8b3bb
 2020-12-14 22:55:50 +00:00
Diego Vela
1ef19adf52 Revert^2 "Add <uses-library> information." 
7f1950928f

Change-Id: I8d3d6fee8e5a2b6eb337abb53f21b9b909b007c9
 2020-12-14 22:05:04 +00:00
Diego Vela
7f1950928f Revert "Add <uses-library> information." 
Revert submission 1427961-uses-libs-23

Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.

Change-Id: If1ca723c357ba3e8d9343fbb0f5d980d1e7ca1fb
 2020-12-14 21:14:24 +00:00
Ulyana Trafimovich
88074044c4 Merge "Add <uses-library> information." am: 4bb99a788a am: b10b31bcad am: 9ba309779b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I303a909ece0b32b7c3aadb7edd6b43cba2a2aa21
 2020-12-10 11:53:43 +00:00
Colin Cross
930acb0a93 Build Settings-robo-testutils for use by SettingsGoogleRoboTests 
Bug: 175124789
Test: m RunSettingsGoogleRoboTests
Change-Id: I385629c5c958e94ea289e88b0e65eb005006f4e3
 2020-12-10 08:04:27 +00:00
Ulya Trafimovich
202ca49dfe Add <uses-library> information. 
The required <uses-library> "org.apache.http.legacy" is in the manifest
for Settings. It is necessary to explicitly add it to `uses_libs`
because it is not among the app dependencies (so Soong does not add it
automatically to the manifest_fixer). It also doesn't add it as a
compatibility library because the target API level for the app is not
below 28.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Test: m out/soong/.intermediates/packages/apps/Settings/Settings/android_common/manifest_check/AndroidManifest.xml
Test: m out/soong/.intermediates/packages/apps/Settings/tests/robotests/SettingsRoboTestStub/android_common/manifest_check/AndroidManifest.xm
Change-Id: Id5d5fe1dff68cf6fce667a00e35710cf0e667d02
 2020-12-08 12:09:53 +00:00
Anton Hansson
0e5e0c77d4 Add explicit dep on framework-wifi.impl 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Bug: 161767237
Bug: 167568930
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval:‌ ‌Cherry-pick
Merged-In: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
 2020-09-02 15:41:40 +00:00
Xin Li
748efff856 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
 2020-08-28 23:35:54 -07:00
Anton Hansson
3d12fcb246 Add explicit dep on ims-common 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
Merged-In: Ic663e206a0e2e780be2f27b5d539c274d4eef245
 2020-07-22 14:40:27 +00:00
Anton Hansson
d3c9df3e7e Add explicit dep on ims-common 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
 2020-07-21 10:18:39 +01:00
Automerger Merge Worker
131287c626 Merge "[Settings] Enable support on testing" am: 84a2951a33 am: fd3557954f 
Change-Id: I943298e3312b800c019b2f98baf630dd45796e37
 2019-12-04 17:26:19 +00:00
Bonian Chen
5cf137e0bb [Settings] Enable support on testing 
1. Support ActivityScenario
2. Support add Service through ShadowServiceManager

Bug: 140542283
Test: build pass
Change-Id: Ib1066394114fb6077e1fa82872f029e6ee2b5da9
 2019-12-03 20:06:59 +08:00
Bonian Chen
1a359b5b22 Merge "[Settings] Fix test case" am: 9d66571966 am: 1aac3bb569 
am: 5b6dcf42af

Change-Id: Ia68856654d377c38444299282a7d4e1bb5c4c6e5
 2019-11-25 21:48:54 -08:00
Bonian Chen
6c25c29464 [Settings] Fix test case 
Change annotation library

Bug: 144664534
Test: build pass
Change-Id: Iffafc3a9a7dadc961d180c6a1ef2764c8d72eb2f
 2019-11-25 22:28:22 +08:00
Bonian Chen
7d2d92df21 Merge "[Settings] Fix robotest build breakage" am: 6c9b9f41d6 am: 635c2fa095 
am: 04b12dd0ae

Change-Id: Ic98c3165d78897c9c7200c613934137d06b26f8b
 2019-11-20 19:18:21 -08:00
Bonian Chen
4a1dbccac6 [Settings] Fix robotest build breakage 
Add annotation library into test build

Bug: 144810473
Test: build pass
Change-Id: Idb4e056fb73a349ac268e5d2292a31fe7d9a6642
 2019-11-20 23:05:55 +08:00
Bonian Chen
f1b43a970c [Settings] MobileNetworkActivity Refactor 
Split MobileNetworkActivity into 2 files.
Enable testing through ActivityScenario

Bug: 141833767
Test: manual
make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest

Change-Id: I9f0f80f5edda53196ce0795113506495e8980e99
 2019-11-04 15:51:54 +08:00
Mill Chen
5606a8c7f5 Enabling sharding RunSettingsRoboTests 
Also fixed failed test cases caused by running
RunSettingsRoboTests with the sharding mechanism.

Bug: 130895860
Test: make RunSettingsRoboTests -j40
Change-Id: I0e5e0764d4ea910b9c0acc693d63a4b793e23d3a
 2019-09-19 21:31:56 +08:00
Colin Cross
2d7cf1d924 Merge "Make test_options.timeout an int64" am: c56651b345 
am: 001b1c556d

Change-Id: I3ed30fbfadfd6c821bb7246d0abba19b9fb00ce6
 2019-05-30 20:24:25 -07:00
Colin Cross
02ce47c2a1 Make test_options.timeout an int64 
Test: m RunSettingsRoboTests
Change-Id: I979268540fb50a22316223f432d3c6cbb259f61a
 2019-05-30 11:32:07 -07:00
Colin Cross
e0e22cf2a4 Convert Settings to Android.bp 
See build/soong/README.md for more information.

Test: m checkbuild
Test: m RunSettingsRoboTests
Change-Id: I267534c095c30833f77273dbdb1893b7830ed45d
Merged-In: I267534c095c30833f77273dbdb1893b7830ed45d
 2019-05-29 14:45:30 -07:00
Colin Cross
946a0fd964 Convert Settings to Android.bp 
See build/soong/README.md for more information.

Test: m checkbuild
Test: m RunSettingsRoboTests-jacoco
Change-Id: I267534c095c30833f77273dbdb1893b7830ed45d
 2019-05-13 13:42:01 -07:00