Anthony Stange
ef4df5132f
Merge "Revert "[API Review] APIs in SubscriptionManager""
2020-03-18 19:41:22 +00:00
Anthony Stange
88de094fe8
Revert "[API Review] APIs in SubscriptionManager"
...
Revert submission 10700361-api-compile
Reason for revert: Build breakage
Reverted Changes:
I06280dbb0:[API Review] APIs in SubscriptionManager
I7bb9b088f:[API Review] APIs in SubscriptionManager
Iefc047f1f:[API Review] APIs in SubscriptionManager
I02dcb21cd:[API Review] APIs in SubscriptionManager
Ibedb31825:[API Review] APIs in SubscriptionManager
I77cad8f82:[API Review] APIs in SubscriptionManager
I80a51d2b8:[API Review] APIs in SubscriptionManager
Change-Id: I327cb795c724239316a2eaf306d983c2b896a3fe
2020-03-18 19:33:47 +00:00
Anna Trostanetski
fcc13f24f5
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd
am: 9d653e5298
am: 038b9549a8
am: ad75e96c91
...
Change-Id: I6b93e4388c00a4c79d7a2376399603bb332c17b6
2020-03-18 19:11:44 +00:00
Peter Wang
88afe392fc
Merge "[API Review] APIs in SubscriptionManager"
2020-03-18 18:53:15 +00:00
Anna Trostanetski
49187777dd
Merge "Show only listUIChanges instead of all" into rvc-dev
2020-03-18 18:15:52 +00:00
TreeHugger Robot
f0c9ee7e39
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda
am: 17962d8186
am: 5e7b076c2d
am: e6e0431e66
...
Change-Id: Ic11e5d15f0db219d8025062d2def6ad5c98c413e
2020-03-18 06:10:40 +00:00
TreeHugger Robot
a2a1056dda
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev
2020-03-18 05:22:27 +00:00
TreeHugger Robot
71357f9d0d
Merge "Ignore broken test cases"
2020-03-18 03:23:31 +00:00
Eric Sandness
f483084edb
Use ChooseLockGeneric When Started By Admin App am: 7430932305
am: 66df88126f
am: e6951038a1
am: f9720237fc
...
Change-Id: Ie0dedea428394e0b9b52584b48ea61671d8e1ef8
2020-03-17 21:12:16 +00:00
atrost
06da8b6ebc
Show only listUIChanges instead of all
...
Use the new method that filters out changes that shouldn't be in the
developer UI.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I7c725a1eca32e2d253b9671c789777b5422ed469
2020-03-17 20:37:49 +00:00
Eric Sandness
7430932305
Use ChooseLockGeneric When Started By Admin App
...
The device management app may run before the end of device provisioning,
and it may start SetNewPasswordActivity. If this happens, use
ChooseLockGeneric instead of SetupChooseLockGeneric. Only use
SetupChoseLockGeneric if SetNewPasswordActivity was started by Setup
Wizard itself.
Fixes: 151552453
Test: atest com.android.settings.password.SetNewPasswordActivityTest
Test: atest com.android.settings.password.ChooseLockGenericTest
Test: Manually run consumer and enterprise device setup
Change-Id: I3b479ed18211d6625654f266fe692f07d0047e4f
2020-03-17 17:16:08 +00:00
Automerger Merge Worker
4727170883
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45
am: a4ad8f636a
am: af6b6d2276
am: 3f8733ddca
...
Change-Id: I7c78a425f3f16ef8d18a4720ee250f83d299f3ed
2020-03-17 14:14:27 +00:00
Yanting Yang
9204d76c45
Merge "Remove the index of the homepage category tiles" into rvc-dev
2020-03-17 13:11:40 +00:00
Automerger Merge Worker
4c8fb69605
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
am: 05985cb26e
am: f82c724f30
am: 7b83400539
...
Change-Id: I33bbe3624d2901d68341a0555a45bbd1b42f9b99
2020-03-17 12:35:45 +00:00
TreeHugger Robot
217740d640
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev
2020-03-17 11:32:34 +00:00
Tsung-Mao Fang
d4ba7c1fa7
Ignore broken test cases
...
Test: Run robo test
Bug: 151572330
Change-Id: I2e2f0664d6e26827513632772e6b77c9f8b089a7
2020-03-17 19:09:24 +08:00
govenliu
26b70a9bc7
[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest
...
Remove the @Ignore tag in ConfigureWifiEntryFragmentTest, and add a fake NetworkDetailsTracker to pass test.
Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
Change-Id: Icf06d27030fa2c68d3c2bee03beb583592beb599
2020-03-17 18:05:00 +08:00
Yanting Yang
298a7fe2e5
Remove the index of the homepage category tiles
...
Do not index the tiles of homepage category since we would like to index
their target activity for search.
Fixes: 151418948
Test: visual
Change-Id: I693534de006b4dbcaf192858e6f7d031bad78fef
2020-03-17 17:55:49 +08:00
Automerger Merge Worker
850ec0b38a
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
am: d4bf77db85
am: 5b0b67f6fd
...
Change-Id: Ib2cc96a21a81b58cf1606daef9a4da48998e5f95
2020-03-17 06:43:58 +00:00
SongFerngWang
3d54554521
Fix sim pin lock preference disappear in dual sim.
...
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.
Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-17 14:35:31 +08:00
TreeHugger Robot
1a84719041
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev
2020-03-17 05:43:45 +00:00
Automerger Merge Worker
ef04267344
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
am: dab418626e
am: 61e1d03d3b
...
Change-Id: I25c789e70f36b64c4756ef3e1f118bdce22f3934
2020-03-17 04:29:14 +00:00
Peter Wang
003d34c723
[API Review] APIs in SubscriptionManager
...
Bug: 146362772
Bug: 148180034
Test: atest SubscriptionControllerTest, TelephonyDatabaseHelperTest, TelephonyProviderTest
Change-Id: I7bb9b088f1a08aaac5b43f264a77272aa52d562d
2020-03-16 21:10:35 -07:00
tim peng
95cd4c9414
Merge "Output switcher header is not updated with the latest media content" into rvc-dev
2020-03-17 03:26:50 +00:00
Tim Peng
36c4949414
Output switcher header is not updated with the latest media content
...
-Register media controller callback
-Update panel header when medadata changes
-Add test cases
Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Id0b8f997899a96c0c94ca6bf099e624a9e87795b
2020-03-17 09:02:34 +08:00
Kweku Adams
a7e58d7732
Change to public POWER_SAVE_MODE_CHANGED broadcast.
...
The POWER_SAVE_MODE_CHANGING broadcast is sent at the same time as the
POWER_SAVE_MODE_CHANGED broadcast. Since broadcasts are asynchronous,
there's no reason to have both, so we're simplifying down to just one.
Bug: 79580230
Test: atest BatterySaverReceiverTest
Change-Id: Ib27fc91bc23126f58532e534575d912e3b72ac43
2020-03-16 12:56:46 -07:00
Automerger Merge Worker
ba861466e8
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c
am: 2fe4235ae3
am: 1eedf27e67
am: 9586c26f3d
...
Change-Id: I284375f76e39aeca2d08245d05235f8e4414abf8
2020-03-16 14:31:43 +00:00
tim peng
b669fff40c
Merge "Handle ransferring state in output switcher" into rvc-dev
2020-03-16 13:17:03 +00:00
Automerger Merge Worker
876a6f5816
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
am: 2ae7c371cb
am: 225007141d
am: 8a20a19b82
...
Change-Id: I81cfd1e401042001cc5cdc39ee0e132f1e043fcf
2020-03-16 12:51:36 +00:00
TreeHugger Robot
6d6e0f45b2
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev
2020-03-16 12:05:02 +00:00
Automerger Merge Worker
d62c3cd5c2
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08
am: 4c2d10ee97
am: 8c051e397b
am: bea9e2e1d2
...
Change-Id: I25fb389004c67d55ce789f090ccaae76ba001aa0
2020-03-16 10:23:39 +00:00
Alex Johnston
8d430de5d5
Fix AppButtonPreferenceControllerTest
...
* isSystem was not being mocked.
* The tests where isSystem should return true
were not being tested properly.
Bug: 151569506
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ib4249bca8f3c0321d0b64b4dbd4c4e5fc29586e1
2020-03-16 09:37:10 +00:00
zoey chen
2fad549b08
[Settings] Fix MobileNetworkActivity test case
...
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkActivityTest
Bug: 144664534
Change-Id: Ifc63646f709b29c3a8947430bcec6a82fae02ea5
2020-03-16 14:51:16 +08:00
Automerger Merge Worker
8064dce464
Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874
am: 026ed69b8c
am: 491eb59cfa
am: 27c5efafe9
...
Change-Id: Iee2521f1e743e237162bf2fc76bc92fa2ac33b42
2020-03-16 04:32:13 +00:00
Mehdi Alizadeh
42a906d874
Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev
2020-03-16 04:01:11 +00:00
Automerger Merge Worker
63067d9e40
Merge "Blur developer setting" into rvc-dev am: 59b3974433
am: 148b737ef2
am: 386b605c61
am: a5fd9a5a44
...
Change-Id: If700d215220a17fb3c7d8617c680a080e485e732
2020-03-16 00:38:51 +00:00
Lucas Dupin
59b3974433
Merge "Blur developer setting" into rvc-dev
2020-03-15 23:28:13 +00:00
Automerger Merge Worker
29aa7d5408
Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96
am: 9f2fb9b595
am: 693cb5a2f2
am: 58dc174c23
...
Change-Id: I64b425f4dd30754586f4bbc472a6ea88b5cc3c2e
2020-03-13 17:30:43 +00:00
TreeHugger Robot
907905bb96
Merge "Refine remove locale warning dialog string" into rvc-dev
2020-03-13 16:43:45 +00:00
Automerger Merge Worker
74f957c212
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059
am: 62d9891328
am: 92b4f17fe2
am: b8743359a3
...
Change-Id: I03ff3d2c1bb45042cced1b8413af357187196d3b
2020-03-13 15:31:28 +00:00
Alex Johnston
37fa5bd059
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev
2020-03-13 14:28:15 +00:00
Automerger Merge Worker
7e427ab997
Merge "Fix tests" into rvc-dev am: 6d8e0fed61
am: f08d965b53
am: 648fe31181
am: 053b614f70
...
Change-Id: Ia20cbab27b29416dd55923bfb993e4d91dab8059
2020-03-13 10:19:57 +00:00
Tsung-Mao Fang
c7ecc98d5f
Merge "Ignore broken test case"
2020-03-13 10:04:29 +00:00
Tsung-Mao Fang
bac694f2a1
Ignore broken test case
...
Bug: 151279674
Test: Run robo test
Change-Id: I6777c126a084fc22a34c76d14f004e75a99dcd9f
2020-03-13 17:33:40 +08:00
TreeHugger Robot
6d8e0fed61
Merge "Fix tests" into rvc-dev
2020-03-13 09:27:16 +00:00
Automerger Merge Worker
a0587e8278
Merge "Remove ignore test case" into rvc-dev am: ad30345078
am: e94cbd98ff
am: 9d37d5df00
am: 526f23e533
...
Change-Id: I0ece09d2b21d44cea1f71e6bde51d9f2a5fbcf48
2020-03-13 05:57:03 +00:00
Edgar Wang
3b47408016
Refine remove locale warning dialog string
...
- If the first language is not selected, just remove the body copy
else warning user the locale will change to another language.
Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
2020-03-13 12:49:21 +08:00
Edgar Wang
ad30345078
Merge "Remove ignore test case" into rvc-dev
2020-03-13 04:45:59 +00:00
Automerger Merge Worker
5616591d2b
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
am: 3f6c723044
am: 2c3ee203bf
am: f2755520a1
...
Change-Id: Ia42aae3bf00ba46dfac23c2172d4d5abbee3ef7d
2020-03-13 04:14:44 +00:00
TreeHugger Robot
89a6fafa33
Merge "Use values-night to control the dark mode background color" into rvc-dev
2020-03-13 03:13:27 +00:00