Commit Graph

38224 Commits

Author SHA1 Message Date
Jeff Sharkey
0bcee25346 DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 1cdc675d7d

Change-Id: I117d8a1f9ab46f375277511da8f59df2db771cb7
2017-10-11 20:24:16 +00:00
Jeff Sharkey
70387afef9 DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 8441943bfa  -s ours

Change-Id: I5c1980e7fb722d4d00194f3c953c91304137eea3
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
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
edgar.huang
bd0d33e3bd There is no NEXT button in find sensor screen of fingerprint.
Precondition: set the Font size and Display size to largest
Enter into the find sensor screen and the NEXT button is missing.
Test: manual - Enter into the find sensor screen -
and can find the NEXT button after sliding the screen.

Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I8f6219ab22abad98111f016d633bf100dc3222ce
2017-10-10 01:51:33 +00:00
Jeff Sharkey
94e678c188 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:31:44 +00:00
Jeff Sharkey
019f31b499 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:31:34 +00:00
Jeff Sharkey
f32a4fad5d 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:31:23 +00: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

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
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

Change-Id: Ife3991761d4fcbf5cecdb6745536f9ed99069a2e
2017-09-29 14:46:23 +00:00
songkailun
39ddac51b6 Merge "Fix wrong format in AndroidManifest.xml"
am: de795d12d1

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

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

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

Change-Id: I88adb043f9fbd9d35ff4ba49c15bddb8125c7b1c
2017-09-26 01:23:12 +00:00
Colin Cross
00c0d436f4 Merge "Remove unnecessary core-oj library"
am: a37bf5616a

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

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
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

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
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  -s ours

Change-Id: I15bdf67a2be0187682a936d3fe8a0ae42d8329b5
2017-09-11 20:27:24 +00:00
debesay guadad
d3c72406b6 Merge "Add ims registration status"
am: 9b7479f8a9  -s ours

Change-Id: I65a6d75b2f2127929794c320fe7596372dd4c6ac
2017-09-11 20:09:47 +00: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