Stephen Chen
95640767d1
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
...
am: f7980fc3cb
2017-05-08 21:04:55 +00:00
Doris Ling
06b670e4df
Merge "Add summary placeholder to data saver preference." into oc-dev
...
am: a3c4339299
2017-05-08 21:04:28 +00:00
TreeHugger Robot
f7980fc3cb
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
2017-05-08 20:44:12 +00:00
TreeHugger Robot
a3c4339299
Merge "Add summary placeholder to data saver preference." into oc-dev
2017-05-08 20:43:56 +00:00
Fan Zhang
f7ba1e7209
Merge "Remove summary template in sleep timeout setting." into oc-dev
...
am: 014ff46fa6
2017-05-08 19:08:20 +00:00
Svetoslav Ganov
bf3ad99a38
Merge "Report normalized package name as default key" into oc-dev
...
am: 0560127e9d
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
Amin Shaikh
293a0f003a
Merge "Show "Forget" button for ephemeral networks." into oc-dev
...
am: 3f303d5fd8
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
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
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
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
2017-05-06 02:07:30 +00:00
nharold
98f209c6e5
Merge "Update references to use PhoneConstantConversion"
...
am: 79694e79d1
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
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
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
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
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
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
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
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
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
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
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
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
