Commit Graph

35347 Commits

Author SHA1 Message Date
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
nharold
d460c1a6b3 Merge "Update references to use PhoneConstantConversion" am: 79694e79d1 am: 98f209c6e5
am: 2e4950879a

Change-Id: I656450f32a00f9a761a6d0069d2f3c59b729e0f5
2017-05-06 02:55:47 +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
nharold
2e4950879a Merge "Update references to use PhoneConstantConversion" am: 79694e79d1
am: 98f209c6e5

Change-Id: I5c7760471d2e48df20955122507b503ca546954e
2017-05-06 02:07:30 +00:00
nharold
98f209c6e5 Merge "Update references to use PhoneConstantConversion"
am: 79694e79d1

Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
2017-05-06 01:57:56 +00:00
nharold
79694e79d1 Merge "Update references to use PhoneConstantConversion" 2017-05-06 01:45:37 +00:00
Roozbeh Pournader
6b06aa1099 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
am: 869d246021

Change-Id: Idb17d5f38526c926ddf2d0ca55d30f806c52d574
2017-05-06 01:39:29 +00:00
TreeHugger Robot
869d246021 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev 2017-05-06 01:34:47 +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
Suprabh Shukla
3cadb80e8d Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
am: 43083b4332

Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
2017-05-05 20:56:10 +00:00
TreeHugger Robot
43083b4332 Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev 2017-05-05 20:48:50 +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
Roozbeh Pournader
15bebece94 Fix bidi direction of dialog and bidi-wrap service name
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.

Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.

Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes: 37761152
2017-05-05 13:40:05 -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
Bill Yi
9330470b28 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 2dcbda8004  -s ours

Change-Id: I8b39a0a9c01fff1d44613e98a390d257e3f2f858
2017-05-05 12:08:31 +00:00
TreeHugger Robot
2dcbda8004 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-05 11:58:06 +00:00
Bill Yi
566095ecf9 Import translations. DO NOT MERGE
Change-Id: I7a4ac37a8286e8f977d70b26a11ee83105b611cf
Auto-generated-cl: translation import
2017-05-04 23:26:52 -07:00
Dan Sandler
ca445e20af Merge "Defend against underspecified notifications." into oc-dev
am: 1bba60cf0e

Change-Id: I5aec6c34bd9c8b985637d38a73a21db88e6642a9
2017-05-05 02:25:31 +00:00
TreeHugger Robot
1bba60cf0e Merge "Defend against underspecified notifications." into oc-dev 2017-05-05 02:21:11 +00:00
Suprabh Shukla
c1f10cb9c6 Adding SecureTouchListener to DeviceAdminAdd
Dropping any touches to the activate admin button if any other
window is partly or wholly obscuring the device admin add window

Test: Cts Verifier -> Device Administration -> Device Admin Tapjacking
Test

Bug: 35056974
Change-Id: I048ecc1944c13fea624eede7861d39df2beeb393
2017-05-04 18:50:33 -07:00
Ajay Panicker
bb98791b80 Merge "Limit btsnoop file size (4/9)" into oc-dev
am: b72a8b5ab3  -s ours

Change-Id: I2ecb2e2c297953eba1f515e636c6204e8474591e
2017-05-04 23:21:19 +00:00
Ajay Panicker
b72a8b5ab3 Merge "Limit btsnoop file size (4/9)" into oc-dev 2017-05-04 22:56:23 +00: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
Julia Reynolds
c265993528 Merge "Only show one copy of each preference" into oc-dev
am: 31de48193e

Change-Id: Ic9b107c57e0db902e8a16c0054f533370c2f819d
2017-05-04 20:15:12 +00:00
Julia Reynolds
31de48193e Merge "Only show one copy of each preference" into oc-dev 2017-05-04 20:08:39 +00:00
Doris Ling
bab86af55b Add summary placeholder to data saver preference.
- reserve 2 lines for the data saver summary to avoid the preference
beging relayout when the summary text get updates.

Change-Id: Ibced7dc4b9620fe45541ea470d34bf83be66480d
Fix: 37925232
Test: visual
2017-05-04 12:37:52 -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
Esteban Talavera
895796aeb4 Merge "Show when work profile notifications are blocked for listener" into oc-dev
am: 607b4d0573

Change-Id: I7181d474d41c6574eea49f5fc65f06a9b75d2b1e
2017-05-04 17:30:18 +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
TreeHugger Robot
607b4d0573 Merge "Show when work profile notifications are blocked for listener" into oc-dev 2017-05-04 17:16:19 +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