Jeff Sharkey
c1574a1ef8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21
...
am: de7c312543
2017-10-11 21:27:27 +00:00
Jeff Sharkey
8bdd94e292
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
...
am: f4e2e26064
2017-10-11 21:26:28 +00:00
Fan Zhang
eef095d0ee
Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8 -s ours
...
am: e39bcb6bf5
2017-10-11 21:11:25 +00:00
Jeff Sharkey
de7c312543
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours
...
am: b410435a21
2017-10-11 21:10:10 +00:00
Jeff Sharkey
f4e2e26064
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
...
am: 9c39da39df
2017-10-11 21:09:20 +00:00
Fan Zhang
e39bcb6bf5
Merge "Move SettingsRobolectricTestRunner to testutils."
...
am: 16db22a9c8
2017-10-11 21:01:23 +00:00
Treehugger Robot
16db22a9c8
Merge "Move SettingsRobolectricTestRunner to testutils."
2017-10-11 20:45:19 +00:00
Jeff Sharkey
b410435a21
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346
...
am: 46bc2bd7bd
2017-10-11 20:39:07 +00:00
Jeff Sharkey
cf1c0b1f58
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours am: 70387afef9
...
am: 9173362f4e
2017-10-11 20:36:04 +00:00
TreeHugger Robot
9c39da39df
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
2017-10-11 20:32:55 +00:00
Jeff Sharkey
46bc2bd7bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
...
am: 0bcee25346
2017-10-11 20:28:11 +00:00
Jeff Sharkey
9173362f4e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours
...
am: 70387afef9
2017-10-11 20:27:42 +00:00
Jeff Sharkey
0bcee25346
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 1cdc675d7d
2017-10-11 20:24:16 +00:00
Jeff Sharkey
70387afef9
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 8441943bfa
2017-10-11 20:24:05 +00:00
Fan Zhang
df94389492
Move SettingsRobolectricTestRunner to testutils.
...
Change-Id: Ia0017983b844cabafc10478adf4839f5755f514c
Merged-In: I6612b1f26404587301c534c8ba60e39d59d6c840
Fixes: 67688380
Test: robotests
2017-10-11 12:27:12 -07:00
Jeff Sharkey
1cdc675d7d
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:30:43 +00:00
Jeff Sharkey
8441943bfa
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:30:31 +00:00
Jeff Sharkey
b5e93969a5
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:30:15 +00:00
Carsten Hauge
5d2919907b
Merge "Avoid NullPointerException when updating preference intents" am: c4b0fa5858
...
am: f38ed428dc
2017-10-02 18:06:32 +00:00
Carsten Hauge
f38ed428dc
Merge "Avoid NullPointerException when updating preference intents"
...
am: c4b0fa5858
2017-10-02 18:03:40 +00:00
Treehugger Robot
c4b0fa5858
Merge "Avoid NullPointerException when updating preference intents"
2017-10-02 17:56:02 +00:00
Carsten Hauge
f35cb6bc91
Avoid NullPointerException when updating preference intents
...
Comparisons changed on the intent action. Sometimes an account
preference intent does not have an action specified.
Fixes: 67075850
Test: manual - go to Settings > Users & accounts and tap an account.
Change-Id: I54cebbc983b55aa1487a122d37ccd5c79bbf519d
2017-10-02 02:01:49 +00:00
songkailun
109d0bafd4
Merge "Fix wrong format in AndroidManifest.xml" am: de795d12d1
...
am: 39ddac51b6
2017-09-29 14:46:23 +00:00
songkailun
39ddac51b6
Merge "Fix wrong format in AndroidManifest.xml"
...
am: de795d12d1
2017-09-29 09:37:17 +00:00
Treehugger Robot
de795d12d1
Merge "Fix wrong format in AndroidManifest.xml"
2017-09-29 06:45:30 +00:00
songkailun
7d2a5901f7
Fix wrong format in AndroidManifest.xml
...
N/A
Change-Id: Idf3b9c22e65d15013f5e3e2f5a1e9719d35ede3a
Signed-off-by: songkailun <songkailun@xiaomi.com >
2017-09-29 09:42:05 +08:00
Lei Yang
17b5110539
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" am: d2f42970bf
...
am: a40f7c0f5e
2017-09-26 23:39:35 +00:00
Lei Yang
a40f7c0f5e
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
...
am: d2f42970bf
2017-09-26 23:35:26 +00:00
Treehugger Robot
d2f42970bf
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
2017-09-26 23:21:44 +00:00
Lei Yang
58fca6385a
Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled
...
"Set up Wi-Fi NFC Tag" dialog cannot be scrolled and "Show password"
is not displayed when setting Font size and Display size to Largest.
To fix this issue, ScrollView should be added.
Fixes: 66936807
Test: manual - long tap a connected Wi-Fi AP and
tap "Write to NFC tag".
Change-Id: I3edcf3c2b9db47319e18405066bcb835b064b690
2017-09-26 10:20:29 +00:00
Colin Cross
d3802f9ff4
Merge "Remove unnecessary core-oj library" am: a37bf5616a
...
am: 00c0d436f4
2017-09-26 01:23:12 +00:00
Colin Cross
00c0d436f4
Merge "Remove unnecessary core-oj library"
...
am: a37bf5616a
2017-09-26 01:18:50 +00:00
Treehugger Robot
a37bf5616a
Merge "Remove unnecessary core-oj library"
2017-09-26 01:12:30 +00:00
Colin Cross
6be287a209
Remove unnecessary core-oj library
...
core-oj is part of the default java libraries and should not be
explicitly included by a package.
Test: m -j checkbuild
Change-Id: Idccd326ebbbfb9121ce556037e79c173bfd08580
2017-09-23 22:09:31 -07:00
Doris Ling
c13415391b
Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0
...
am: 296c46404c
2017-09-21 19:27:20 +00:00
Doris Ling
296c46404c
Merge "Fix NPE crash in UsageAccessDetails"
...
am: cd959f28a0
2017-09-21 19:24:52 +00:00
Doris Ling
cd959f28a0
Merge "Fix NPE crash in UsageAccessDetails"
2017-09-21 19:21:03 +00:00
tiansiming
39de7aedee
Fix NPE crash in UsageAccessDetails
...
mPackageInfo will be null in RefreshUI method in UsageAccessDetails.java
Bug:https://issuetracker.google.com/issues/65872768
Test:As explained in the link above
Change-Id: I8bd4b822cfe5d8a3347ca7f5886605cbdfb9b8b6
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-09-21 14:12:50 +08:00
Doris Ling
18c3bde1d5
Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea
...
am: 0533f9ff4a
2017-09-15 02:06:37 +00:00
Doris Ling
0533f9ff4a
Merge "Default apps settings disappear when switching to secondary user"
...
am: 939265d6ea
2017-09-15 01:33:16 +00:00
Doris Ling
939265d6ea
Merge "Default apps settings disappear when switching to secondary user"
2017-09-14 22:13:58 +00:00
edgar.huang
e7da16fc8f
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f
...
am: f95e7f9056
2017-09-14 20:39:42 +00:00
edgar.huang
f95e7f9056
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
...
am: 62a021850f
2017-09-14 20:37:15 +00:00
Treehugger Robot
62a021850f
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
2017-09-14 20:28:55 +00:00
Erik Kline
de272fcd2a
Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf
...
am: d3f4a27c59
2017-09-14 08:17:00 +00:00
Erik Kline
d3f4a27c59
Merge changes Icd3d09aa,I4b070964
...
am: a0661c4fdf
2017-09-14 08:14:09 +00:00
Treehugger Robot
a0661c4fdf
Merge changes Icd3d09aa,I4b070964
...
* changes:
Include IPv6 DNS servers in wifi details
Separate multiple DNS addresses with newlines.
2017-09-14 08:10:25 +00:00
Erik Kline
5b206aec69
Include IPv6 DNS servers in wifi details
...
Test: as follows
- built
- flashed
- booted
- export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
make -j RunSettingsRoboTests
RunSettingsRoboTests:
RunSettingsRoboTests: Time: 19.821
RunSettingsRoboTests:
RunSettingsRoboTests: OK (37 tests)
RunSettingsRoboTests:
- make -j RunSettingsRoboTests
RunSettingsRoboTests: ...........................
RunSettingsRoboTests: Time: 424.847
RunSettingsRoboTests:
RunSettingsRoboTests: OK (2250 tests)
RunSettingsRoboTests:
Bug: 65037256
Bug: 65467586
Merged-In: If15181d557e9abce75111a6e1fff4e12586d7dbc
Merged-In: I55fbd611fee9f17215412a76b480cdee96f62b32
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
(cherry picked from commit 9adc588749
2017-09-14 14:48:50 +09:00
Sundeep Ghuman
049d515dc4
Separate multiple DNS addresses with newlines.
...
Bug: b/65037256
Bug: 65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit 2716e841be
2017-09-14 11:38:12 +09:00
Peng Du
f1f7dcb2f5
Default apps settings disappear when switching to secondary user
...
When switching to a secondary user, Settings will disable all extra
categories that aren't configured in SETTINGS_FOR_RESTRICTED.
As the result, Default apps settings disappear.
To fix this issue, AdvancedAppsActivity class of Default apps settings
should be added to SETTINGS_FOR_RESTRICTED.
Fixes: 65616610
Test: manual - switch to a secondary user
and go to Settings > Apps & notifications.
Change-Id: Ie9f3b1d215e2e43bf25b8dd2971f86bd60e94d04
2017-09-13 09:57:25 +00:00
