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
edgar.huang
bbd47bd460
Don't need to authenticate fingerprint when the fingerprint list is empty.
...
Enter into the fingerprint list screen and can authenticate fingerprint still when the list is empty.
Test: manual - enrolling some fingerprints and remove all fingerprintd, touch the fingerprint touch panel and no response.
2017-09-13 11:04:01 +08:00
debesay guadad
91b143383c
Merge "Add ims registration status" am: 9b7479f8a9 -s ours
...
am: d3c72406b6
2017-09-11 20:27:24 +00:00
debesay guadad
d3c72406b6
Merge "Add ims registration status"
...
am: 9b7479f8a9
2017-09-11 20:09:47 +00:00
Brad Ebinger
99768cc46c
Merge "Add ims registration status" into stage-aosp-master
...
am: af845720f6
2017-09-11 19:54:02 +00:00
Treehugger Robot
9b7479f8a9
Merge "Add ims registration status"
2017-09-11 19:44:31 +00:00
Brad Ebinger
af845720f6
Merge "Add ims registration status" into stage-aosp-master
2017-09-11 19:42:37 +00:00
Amit Mahajan
154779b6af
Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09
...
am: 6ca28e8362
2017-09-11 17:51:18 +00:00
Amit Mahajan
6ca28e8362
Merge "Change to disable mvno data field in ApnEditor if needed."
...
am: c2c0edff09
2017-09-11 17:37:55 +00:00
Treehugger Robot
c2c0edff09
Merge "Change to disable mvno data field in ApnEditor if needed."
2017-09-11 17:21:07 +00:00
Amit Mahajan
ad8eba3097
Change to disable mvno data field in ApnEditor if needed.
...
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
2017-09-11 09:08:49 -07:00
daqi
21e55623f2
Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508
...
am: 93860b298b
2017-09-08 10:10:16 +00:00
daqi
93860b298b
Merge "Fix TrustedCredentialsSettings NPE"
...
am: c9e532f508
2017-09-08 10:04:17 +00:00
Treehugger Robot
c9e532f508
Merge "Fix TrustedCredentialsSettings NPE"
2017-09-08 09:56:31 +00:00
debesay guadad
d6bddbc4db
Add ims registration status
...
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.
Test: manual Checked "IMS registration state" in Status menu
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 21:03:06 +00:00
debesay guadad
96dc322901
Add ims registration status
...
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.
Test: manual Checked "IMS registration state" in Status menu
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 20:59:32 +00:00
daqi
be47df7395
Fix TrustedCredentialsSettings NPE
...
[Cause of Defect]
TrustedCredentialsSettings#mKeyChainConnectionByProfileId is get/set by
more than one thread. Main thread would set it in onDestroy method, and
AsyncTask would get and set in the doInBackground method. So
mKeyChainConnectionByProfileId.get(profileId) would get null after
onDestroy method get called.
Bug: N/A
Test: Debugger to simulate concurrency
Change-Id: I0664d1e9b88b079855354ce0e6fe014a98a22327
Signed-off-by: daqi <daqi@xiaomi.com >
2017-09-07 17:21:25 +08:00
Bill Yi
6171c4a5bb
Import translations. DO NOT MERGE
...
am: 535dd7f066
2017-09-06 18:27:05 +00:00
Bill Yi
535dd7f066
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ic5ea1a8891c0c4cb30fa9466e2416dd469768814
2017-09-06 08:36:23 -07:00
edgar.huang
e096a55f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
...
am: 8f42d1a4ab
2017-09-06 00:30:44 +00:00
edgar.huang
8f42d1a4ab
Merge "Settings is crashed high probability when doing follow steps"
...
am: 2584202cb7
2017-09-06 00:21:17 +00:00
Treehugger Robot
2584202cb7
Merge "Settings is crashed high probability when doing follow steps"
2017-09-06 00:12:44 +00:00
edgar.huang
ab6f11f47f
Settings is crashed high probability when doing follow steps
...
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
2017-09-05 06:35:27 +00:00
Colin Cross
450f423a21
Merge "Fix errorprone build" am: 0bed3cacd7 -s ours
...
am: a1bcb02184
2017-08-31 22:27:59 +00:00
Colin Cross
a1bcb02184
Merge "Fix errorprone build"
...
am: 0bed3cacd7
2017-08-31 22:24:00 +00:00
Treehugger Robot
0bed3cacd7
Merge "Fix errorprone build"
2017-08-31 22:16:52 +00:00
Phil Weaver
f8a7b8aff0
resolve merge conflicts of 94c5202965 to oc-dr1-dev
...
am: f65e790ba0
2017-08-31 17:34:40 +00:00
