Commit Graph

1644 Commits

Author SHA1 Message Date
Fan Zhang
f7ba1e7209 Merge "Remove summary template in sleep timeout setting." into oc-dev
am: 014ff46fa6

Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845
2017-05-08 19:08:20 +00:00
Svetoslav Ganov
bf3ad99a38 Merge "Report normalized package name as default key" into oc-dev
am: 0560127e9d

Change-Id: Id09f3e8efd951de0a96a604cab336cef0bdcd265
2017-05-08 19:07:55 +00:00
TreeHugger Robot
014ff46fa6 Merge "Remove summary template in sleep timeout setting." into oc-dev 2017-05-08 18:57:57 +00:00
Svetoslav Ganov
0560127e9d Merge "Report normalized package name as default key" into oc-dev 2017-05-08 18:57:23 +00:00
Svet Ganov
7d3fb0481d Report normalized package name as default key
Test: make RunSettingsRoboTests -j90

bug:36978445

Change-Id: I593de89c4fa4e9c63a86b9844736e38dce30a258
2017-05-08 18:56:47 +00:00
Matthew Fritze
ab0b3f6790 Prevent race conditions after dropping database
Block all loaders from accessing the database
before indexing is complete.

Bug: 37501479
Test: make RunSettingsRoboTests
Change-Id: I2af98dcf6bceacbeffa70bd40879c97bb0cbc828
Merged-In: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
2017-05-08 18:48:04 +00:00
Matthew Fritze
7ae3c078b6 Remove accessibility duplicates in settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-08 18:34:43 +00:00
Amin Shaikh
293a0f003a Merge "Show "Forget" button for ephemeral networks." into oc-dev
am: 3f303d5fd8

Change-Id: Ic8c5028ac48b36a03871423cb867518fd5d38dc4
2017-05-08 17:11:48 +00:00
TreeHugger Robot
3f303d5fd8 Merge "Show "Forget" button for ephemeral networks." into oc-dev 2017-05-08 17:07:33 +00:00
Daniel Nishi
bc628dfdd9 Merge "Fix Settings crash in Storage settings." into oc-dev
am: 816956d249

Change-Id: I3bd38a5cd716df4d4c91ab762870ad74c626de6d
2017-05-08 16:50:17 +00:00
Daniel Nishi
816956d249 Merge "Fix Settings crash in Storage settings." into oc-dev 2017-05-08 16:45:07 +00:00
Fan Zhang
779548122b Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
am: 4f5b13f97a

Change-Id: I7166624e96ed82f523545f390457661dfb7c3d42
2017-05-06 02:46:38 +00:00
TreeHugger Robot
4f5b13f97a Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev 2017-05-06 02:42:38 +00:00
Fan Zhang
0335cd1e9b Fix crash when there is no emergencybroadcast app on device
Some devices do not have emergencybroadcast app installed, so we should
not show the preference item for it. Add the preference controller into
AppAndNotificationFragment properly hides it.

Change-Id: Ic39ba24da9bd8f3200a5e44232a5489e35c48c0a
Fix: 37945069
Test: make RunSettingsRoboTests
2017-05-05 17:42:25 -07:00
Doris Ling
7c5ef68505 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
am: f9d9524574

Change-Id: I8b02370267e682ec17efcdf877c960e4189304ae
2017-05-06 00:02:54 +00:00
TreeHugger Robot
f9d9524574 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev 2017-05-05 23:59:29 +00:00
Fan Zhang
12cc6aad3c Merge "Update tether summary text when airplane mode turns on" into oc-dev
am: fe5d64feb0

Change-Id: I3bfc37b5bcdcf562faf2c528048e0a5c9427a8f2
2017-05-05 22:14:10 +00:00
Doris Ling
cc28cb372d Fix crash when primary user select app installed by secondary user.
- PackageManager.getPackageInfo() can return null. When trying to check
the app permission info, check for null package info and only process
the permission info when package info is available.
- Update usage of PackageManager.MATCH_UNINSTALLED_PACKAGES to
PackageManager.MATCH_ANY_USER, as the implementation for querying
packages for other users have been changed.
- Add PackageManager APIs used by AppStateAppOpsBridge to
IPackageManagerWrapper for test purpose.
- Change UserManager.get() to Context.getSystemService() to fix test
failure.

Change-Id: I52de924618aa252ffaae02b8f06ebe5b1d0def61
Fix: 37409266
Test: make RunSettingsRoboTests
2017-05-05 14:53:32 -07:00
TreeHugger Robot
fe5d64feb0 Merge "Update tether summary text when airplane mode turns on" into oc-dev 2017-05-05 21:52:07 +00:00
Fan Zhang
cdca63c4c7 Remove summary template in sleep timeout setting.
The template causes incorrect display in search, and it's not
needded by anyone in code.

Bug: 36101902
Test: rerun robotests
Change-Id: Ib399e15c799e08d377b124e88eda0b8f13494ed3
2017-05-05 13:40:36 -07:00
Fan Zhang
768824d7ad Update tether summary text when airplane mode turns on
Change-Id: I62c52351abbad50aeac077785afb21822773956e
Fix: 37934871
Test: make RunSettingsRoboTests
2017-05-05 12:55:11 -07:00
jackqdyulei
83e2511d45 Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
am: 651261c7dd

Change-Id: I3c030efa5dc025dbeae7dfa059d58cd617f2691a
2017-05-05 19:24:11 +00:00
TreeHugger Robot
651261c7dd Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev 2017-05-05 18:55:29 +00:00
jackqdyulei
01e690e377 Only use PROCESS_STATE_TOP as foreground time.
There are some miscalculations in state FOREGROUND_SERVICE and
FOREGROUND, so we move them out of the foreground time for now.

We will fix it after O and may add them back later.

Bug: 37000096
Test: RunSettingsRoboTests
Change-Id: Ic3f2f7fa69e8a213895c601630d1cca94fd32220
2017-05-05 10:23:09 -07:00
Daniel Nishi
8381755263 Fix Settings crash in Storage settings.
If you tap aggressively before the fragment has fully initialized, it
was possible to NPE. This null-checks to avoid this.

Change-Id: I3488245d230cf1e16b23e34614c8e6b43ea14ff1
Fixes: 37945253
Test: Robotest
2017-05-04 14:12:45 -07:00
Daniel Nishi
7d50d9db12 Merge "Fix a bug where override filter was always on." into oc-dev
am: 408fd90102

Change-Id: I800644b0b754b6d2ff844531bfccce47caebfbe1
2017-05-04 17:30:41 +00:00
Daniel Nishi
408fd90102 Merge "Fix a bug where override filter was always on." into oc-dev 2017-05-04 17:18:37 +00:00
Fan Zhang
d8b6244d82 Merge "Skip "null" string when building advanced button summary" into oc-dev
am: e4eb65c00e

Change-Id: Ife67012f081f60d06fc3cec7d40673dfb3e032dc
2017-05-04 16:17:46 +00:00
Fan Zhang
e4eb65c00e Merge "Skip "null" string when building advanced button summary" into oc-dev 2017-05-04 16:12:27 +00:00
Amin Shaikh
dec19d10c2 Show "Forget" button for ephemeral networks.
- Move forget button preference handling logic to
WifiDetailPreferenceController
- Remove unnecessary updateInfo call in onResume since
NETWORK_STATE_CHANGED_ACTION is a sticky broadcast
- Populate network state fields and set up initial wifi state
when the Preference is displayed instead of waiting for onResume

Bug: 37751816
Test: m RunSettingsRoboTests && manually tested on device
Change-Id: I509013c72a0d26fc9a3feca564d92a0ab8414d1e
2017-05-03 21:17:25 -07:00
Lorenzo Colitti
fdd0f1e141 Merge "Add a "sign into network" button to the wifi details page." into oc-dev
am: 33b0104cfc

Change-Id: I38a3dfa0dcd17e073b6346dddfdd2d1434035b4a
2017-05-04 02:12:20 +00:00
Lorenzo Colitti
33b0104cfc Merge "Add a "sign into network" button to the wifi details page." into oc-dev 2017-05-04 02:06:50 +00:00
jackqdyulei
85950d5ebd Merge "Update "Phone idle" subtext" into oc-dev
am: 3a1d6db0e7

Change-Id: I2c9b8a4c1d80911467d51ee883fb0a9a8bd01b43
2017-05-04 01:16:08 +00:00
Glen Kuhne
11853a75e3 Merge "Fix null pointer exception in wifi settings" into oc-dev
am: eb6eb99a56

Change-Id: Id7fa8980306e02e5b441278b76f01d9343119ecf
2017-05-04 01:15:47 +00:00
TreeHugger Robot
3a1d6db0e7 Merge "Update "Phone idle" subtext" into oc-dev 2017-05-04 01:11:24 +00:00
TreeHugger Robot
eb6eb99a56 Merge "Fix null pointer exception in wifi settings" into oc-dev 2017-05-04 01:04:50 +00:00
Daniel Nishi
bf1f93698e Fix a bug where override filter was always on.
Change-Id: I1df52f13d8e335362d2eec18c968227ed9ecf299
Fixes: 37952170
Test: Settings unit test
2017-05-03 17:31:21 -07:00
Jeremy Joslin
91dd31d722 Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
am: b8eb78b321

Change-Id: I0be3efe4d409910fb8be30a3e667648d87d0975a
2017-05-03 23:05:59 +00:00
TreeHugger Robot
b8eb78b321 Merge "Allow "None" to be selected as a Network rating provider." into oc-dev 2017-05-03 22:57:16 +00:00
Glen Kuhne
3c5bd235f3 Fix null pointer exception in wifi settings
Fixes a null pointer exception that can occur during setup wizard.

Bug: 37873425
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I40de883fae6ccde13ad264f9b8b2d9da9745eb24
2017-05-03 15:53:16 -07:00
jackqdyulei
995ca362c9 Update "Phone idle" subtext
Bug: 37897135
Test: RunSettingsRoboTests
Change-Id: I38a63ef9fdf574ba277ed889e7e070c36ae14b01
2017-05-03 15:27:50 -07:00
Fan Zhang
540023608d Skip "null" string when building advanced button summary
- Also added help string to SoundSettings as a side fix.

Change-Id: Ia81a46c6e199b72b52ae1fa9d996c094193b506c
Fix: 37933524
Test: robotests
2017-05-03 15:05:22 -07:00
Daniel Nishi
f917c0aa24 Merge "Always use GB as the unit in Storage Settings." into oc-dev
am: 833927929e

Change-Id: I569b89bcf10fa32f86978c80fb646c0d4503b89e
2017-05-03 18:04:51 +00:00
Daniel Nishi
169fd4693f Merge "Don't overly hide the Files preference." into oc-dev
am: 0c58fbd345

Change-Id: I4dbc750366d9fdbd6bc18abd751e47694de1d368
2017-05-03 18:04:17 +00:00
Daniel Nishi
833927929e Merge "Always use GB as the unit in Storage Settings." into oc-dev 2017-05-03 18:00:19 +00:00
Daniel Nishi
0c58fbd345 Merge "Don't overly hide the Files preference." into oc-dev 2017-05-03 17:59:08 +00:00
Lorenzo Colitti
b6245156f6 Add a "sign into network" button to the wifi details page.
Bug: 36203355
Test: manually signed into captive portal
Test: make -j64 RunSettingsRoboTests
Change-Id: I3242ef30125ddfdaaac9b80ead4f8ac14ea6d364
2017-05-03 22:14:08 +09:00
jackqdyulei
09adbd2f3b Merge "Hide subtitle for wifi and bluetooth" into oc-dev
am: 4b50e58a1d

Change-Id: I2997ffe57474de973a66932b685fbbaf9bf77955
2017-05-03 02:24:48 +00:00
TreeHugger Robot
4b50e58a1d Merge "Hide subtitle for wifi and bluetooth" into oc-dev 2017-05-03 02:18:53 +00:00
Daniel Nishi
f7fa542eb6 Don't overly hide the Files preference.
This occurred this because the files preference was initialized during
displayPreference(), but the volume used to initialize it was not being
set until after the displayPreference() call. In this case, the files
preference would hide itself and never come back.

This fixes this by double-checking the Files visibility status whenever
we set the volume.

Change-Id: I0b1a7a9566e9caece39ec58706fbca034ef4c1c2
Fixes: 37790776
Test: Settings robotest
2017-05-02 15:42:55 -07:00