Commit Graph

18305 Commits

Author SHA1 Message Date
Cai, Min1
f523ca10aa Merge "Refresh payment preference while resume" am: 05650bb3da
am: 088baf348b

Change-Id: I146f0925e1b9c68e2cd04d76897a59fe87ac741d
2017-10-16 19:41:44 +00:00
Cai, Min1
088baf348b Merge "Refresh payment preference while resume"
am: 05650bb3da

Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba
2017-10-16 19:29:33 +00:00
Daniel Nishi
f1dc9e65f1 Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7
am: 5973d32c77

Change-Id: I66747a250e7461cfc3fe04fb8228bb7fe7541b5a
2017-10-15 03:59:02 +00:00
Daniel Nishi
5973d32c77 Merge "Fix PrivateVolumeSettings be launched repeatedly"
am: 31a7b2a4c7

Change-Id: I2ee1fe82349968182b21a716a36ac716c0425080
2017-10-15 03:47:13 +00:00
Treehugger Robot
05650bb3da Merge "Refresh payment preference while resume" 2017-10-13 23:10:13 +00:00
Cai, Min1
0b97d35478 Refresh payment preference while resume
To show latest payment service list on Tap&pay menu.

Test: install payment service and go back to Tap&pay menu
Bug: 67718335
Change-Id: I6f421176b9c461898224b50d06f67a49645f0d18
2017-10-12 01:12:14 +00:00
Jeff Sharkey
8bdd94e292 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064

Change-Id: I21d3d925c533b9bbcb8bef5807662a1ad6186394
2017-10-11 21:26:28 +00:00
Jeff Sharkey
f4e2e26064 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
am: 9c39da39df

Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
2017-10-11 21:09:20 +00:00
Li YanJia
b699603f68 Fix PrivateVolumeSettings be launched repeatedly
Symptom:
After manually pull out the removable sd card or usb storage in
StorageSettings screen, it automatically moves to
PrivateVolumeSettings screen. This time, launching
PrivateVolumeSettings Activity is triggered six times and end-user
has to press back key six times to exit PrivateVolumeSettings
screen.

Root cause:
When sd card is pulled out, StorageSettings got three state change
event (UNMOUNTED, BAD_REMOVAL and onDiskDestroyed) through
StorageEventListener that triggers launching PrivateVolumeSettings
screen. In addition StorageSettings register the listener two
times, then StorageSettings receives six event in total.
Therefore, PrivateVolumeSettings screen is launched six times.

Solution:
Skip launching PrivateVolumeSettings if it's already triggered.
And removed the duplicated listener registration.

Bug: 67612903

Change-Id: Iabef51677a393977b7be29fc54aa050434213500
2017-10-10 12:49:32 +09: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

Change-Id: I3fcc041677b4d739952902076184a8fa1dd73dad
2017-10-02 18:06:32 +00:00
Carsten Hauge
f38ed428dc Merge "Avoid NullPointerException when updating preference intents"
am: c4b0fa5858

Change-Id: I403d380ebfbbb0c70fdf5b6c9ff51267a5163e6f
2017-10-02 18:03:40 +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
Doris Ling
c13415391b Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0
am: 296c46404c

Change-Id: I38483ed934187e185efc6a2e38ddde7cef0c4e8f
2017-09-21 19:27:20 +00:00
Doris Ling
296c46404c Merge "Fix NPE crash in UsageAccessDetails"
am: cd959f28a0

Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252
2017-09-21 19:24:52 +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

Change-Id: Ib3175a8ffbba9e229bb86cb561c63342f20608bc
2017-09-15 02:06:37 +00:00
Doris Ling
0533f9ff4a Merge "Default apps settings disappear when switching to secondary user"
am: 939265d6ea

Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd
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

Change-Id: Ie6b48a64c62371cd276112b5b149fdf63341bb6f
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

Change-Id: I6baf91aa5b558616e3d30aaa2edbdbc0f47072c3
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

Change-Id: Ia53ed00cc596cdbeff9042d74cdc2852cd352cc9
2017-09-14 08:17:00 +00:00
Erik Kline
d3f4a27c59 Merge changes Icd3d09aa,I4b070964
am: a0661c4fdf

Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642
2017-09-14 08:14:09 +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
Brad Ebinger
99768cc46c Merge "Add ims registration status" into stage-aosp-master
am: af845720f6

Change-Id: I5daf6e9a55e10d20fc03be6a54801ad6d6533bf8
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

Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c
2017-09-11 17:51:18 +00:00
Amit Mahajan
6ca28e8362 Merge "Change to disable mvno data field in ApnEditor if needed."
am: c2c0edff09

Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc
2017-09-11 17:37:55 +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

Change-Id: Ic6fd44c164821fc7c5594b1b5082c2ee6e36aa0f
2017-09-08 10:10:16 +00:00
daqi
93860b298b Merge "Fix TrustedCredentialsSettings NPE"
am: c9e532f508

Change-Id: I2ce8ea95abbbd1d522be4897069d4515354d3b14
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
edgar.huang
e096a55f03 Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
am: 8f42d1a4ab

Change-Id: Ie44be5ec6a14bc137b08d6c233704af03f4a27ad
2017-09-06 00:30:44 +00:00
edgar.huang
8f42d1a4ab Merge "Settings is crashed high probability when doing follow steps"
am: 2584202cb7

Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46
2017-09-06 00:21:17 +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
Phil Weaver
f8a7b8aff0 resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0

Change-Id: Id77101229f9c4ceca346f7c2d281d9602f3dd204
2017-08-31 17:34:40 +00:00
Maurice Lam
61c8796a5e Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
am: 108611ff34

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b
2017-08-31 02:10:37 +00:00
Phil Weaver
f65e790ba0 resolve merge conflicts of 94c5202965 to oc-dr1-dev
Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
2017-08-30 22:57:39 +00:00
Phil Weaver
94c5202965 Backport overlay security fix
Replacing app opps fix with the flag that is used
elsewhere.

Bug: 37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3

Change-Id: I858f3585b2e7d334cddcf38bd0ac6481e778b6b6
2017-08-29 00:57:11 +00:00
liming.wang
0db5a99608 Fix Settings crashes after tapping "Learn more" in fingerprint page
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.

Fixes: 64322876 
Test: manual - go to Settings > Security & Location > Fingerprint
               and then tap "Learn more"

Change-Id: I70beca880261df0ee3eef94f5469f44130ffd95a
2017-08-23 03:32:40 +00:00
Amit Mahajan
efe090ec60 Change to not cache user entered apn type as user may change it.
Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
2017-08-22 19:36:45 +00:00
TreeHugger Robot
937e2d5a8e Change empty apn type in user entered APN to non-read-only types.
Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug: 38186417

Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3
2017-08-22 18:20:32 +00:00