Commit Graph

64122 Commits

Author SHA1 Message Date
Makoto Onuki
ef3aa48afd Merge "Fix sqlite time measurement." into nyc-dev am: c2c5b23
am: 9a5ca31

* commit '9a5ca319bca2bec4a311425ee676cc00f664bde3':
  Fix sqlite time measurement.

Change-Id: I2baeeb16e91e847bf192703c7f31e0ebe950e8a1
2016-04-07 18:49:27 +00:00
Makoto Onuki
9a5ca319bc Merge "Fix sqlite time measurement." into nyc-dev
am: c2c5b23

* commit 'c2c5b230995d8880c74b1cf6043cd43b317efabc':
  Fix sqlite time measurement.

Change-Id: I12afbae0eec6db332aae1b2e5fdf0300a36a8bd8
2016-04-07 18:45:50 +00:00
Makoto Onuki
c2c5b23099 Merge "Fix sqlite time measurement." into nyc-dev 2016-04-07 18:38:42 +00:00
Jeff Sharkey
3b2a425718 Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev am: 8b704d44
am: 0f74260

* commit '0f7426090aead6b5ea93ee612619d5a7855b1f4f':
  Revert "Remove old FUSE bypass now that we have sdcardfs."

Change-Id: I467f76250bc684d92bed030d22314d1f637464db
2016-04-07 18:06:44 +00:00
Jeff Sharkey
0f7426090a Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev
am: 8b704d44

* commit '8b704d4474caf9fa0c7a734582fb6cce55248de4':
  Revert "Remove old FUSE bypass now that we have sdcardfs."

Change-Id: I65236959348e3a2781e82e9d56eecb58f5d7fcce
2016-04-07 18:03:17 +00:00
Jeff Sharkey
d9050d8158 Merge "Give users and devices control over sdcardfs." into nyc-dev am: 7d66e83
am: 16e0976

* commit '16e0976152ff8cd6eb5cffd5f723f4bb6c220fd4':
  Give users and devices control over sdcardfs.

Change-Id: Ic311b3bf56f5e9417f9785dab25cbbd7ea148c30
2016-04-07 18:00:03 +00:00
Chris Wren
0132172c69 Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev am: e7e7cb2
am: 9a93368

* commit '9a9336868e865e6cc662ff233f9133fa1159b7f5':
  add an onListenerDisconnected() callback to NLS

Change-Id: I4d84ce81df7f79f3ab983ec43c8f1b67fc358220
2016-04-07 18:00:00 +00:00
Jeff Sharkey
16e0976152 Merge "Give users and devices control over sdcardfs." into nyc-dev
am: 7d66e83

* commit '7d66e8313958e8225ea6c3df2ca6696dbc6d3d79':
  Give users and devices control over sdcardfs.

Change-Id: Ie2861a3268768fd6ed55e20bc8a746bb3bc61fff
2016-04-07 17:56:33 +00:00
Chris Wren
9a9336868e Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev
am: e7e7cb2

* commit 'e7e7cb2d057348644002e986eeb68c211c8fa071':
  add an onListenerDisconnected() callback to NLS

Change-Id: I1448b1e8c368c083313afb6c31582e32a502a684
2016-04-07 17:56:30 +00:00
Jeff Sharkey
8b704d4474 Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev 2016-04-07 17:56:21 +00:00
Jeff Sharkey
8575da1cc0 Revert "Remove old FUSE bypass now that we have sdcardfs."
This reverts commit feef8b62ee.

Change-Id: I90a3b8edf95cb5b631a85168671cf8b5a406d9ea
2016-04-07 17:56:06 +00:00
Jeff Sharkey
7d66e83139 Merge "Give users and devices control over sdcardfs." into nyc-dev 2016-04-07 17:52:41 +00:00
Chris Wren
e7e7cb2d05 Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev 2016-04-07 17:44:10 +00:00
Jeff Sharkey
33dd156ed0 Give users and devices control over sdcardfs.
Instead of relying only on kernel support for sdcardfs, give each
device the ability to quickly toggle between sdcardfs and FUSE.  Also
add the ability to users to explicitly enable/disable the behavior
for testing and debugging purposes.

Bug: 27991427
Change-Id: Ia57f12f6ead888ab85101004bdd8c8003537b116
2016-04-07 11:30:55 -06:00
Chris Wren
5717bd6ddb add an onListenerDisconnected() callback to NLS
Also block all callbacks if the listener is not connected.

Also update the documentation to make lifecycle restictions
more clear.

Bug: 27582839
Change-Id: I029304e1fb87bd8d754cfb4641ba8cc095fc2b2e
2016-04-07 13:12:21 -04:00
Todd Kennedy
956759a9e5 Merge "Only parse an APK once" into nyc-dev am: 9d8da4c
am: 40ec11a

* commit '40ec11a392c275f8914e8f663f1beeb6b6f6678b':
  Only parse an APK once

Change-Id: I7ad181116e896209257d9414b4ca85ca4727630b
2016-04-07 17:01:44 +00:00
Todd Kennedy
40ec11a392 Merge "Only parse an APK once" into nyc-dev
am: 9d8da4c

* commit '9d8da4cdf182643cd015bbf7a8ae1da9e53eb8b4':
  Only parse an APK once

Change-Id: I8e8b09edd75912d4bac7556c3788d350599e9bd8
2016-04-07 16:58:21 +00:00
Robin Lee
34afb60a8d Merge "Internal API for system apps to determine default network for other apps" into nyc-dev am: 1b83651
am: a948f88

* commit 'a948f8872aa045ab22f42285f195fdb413c5ff66':
  Internal API for system apps to determine default network for other apps

Change-Id: Ib719f0cebb41afe4aa52241f3797598a7e468d2d
2016-04-07 16:51:53 +00:00
Oren Blasberg
8a9e5a2d39 Merge "Fix icon spacing on both MenuPopup implementations." into nyc-dev am: 1b65b01
am: cbcfe92

* commit 'cbcfe92763e80aaf740385a7014328da68f6142b':
  Fix icon spacing on both MenuPopup implementations.

Change-Id: I4c4467dd479c0b57b44102ceb040a960886a3156
2016-04-07 16:51:52 +00:00
Phil Weaver
9711357736 Merge "Allow tests to change UiAutomation flags." into nyc-dev am: d408b99
am: 8c1e665

* commit '8c1e665bc58e6c883f0f5a939dbb777da383ce96':
  Allow tests to change UiAutomation flags.

Change-Id: Ibd6faa5f061ff88dc09310bf36b7f2a10212a8f1
2016-04-07 16:51:49 +00:00
Todd Kennedy
9d8da4cdf1 Merge "Only parse an APK once" into nyc-dev 2016-04-07 16:51:11 +00:00
Robin Lee
a948f8872a Merge "Internal API for system apps to determine default network for other apps" into nyc-dev
am: 1b83651

* commit '1b83651e7fca620589a6317d3a8559e43a19485c':
  Internal API for system apps to determine default network for other apps

Change-Id: Ia928e2621e61946cdfa70ea186e9a00036dec4de
2016-04-07 16:48:05 +00:00
Oren Blasberg
cbcfe92763 Merge "Fix icon spacing on both MenuPopup implementations." into nyc-dev
am: 1b65b01

* commit '1b65b01f9317f8438e53e2b76d4790d8ed11c346':
  Fix icon spacing on both MenuPopup implementations.

Change-Id: Ie5ead0b76552b7b93cd69fdc475ad74554711fed
2016-04-07 16:48:03 +00:00
Phil Weaver
8c1e665bc5 Merge "Allow tests to change UiAutomation flags." into nyc-dev
am: d408b99

* commit 'd408b995c32710f8306af83c13cccdfa70cca242':
  Allow tests to change UiAutomation flags.

Change-Id: I2b59047a63905fd8c41e08d6aa140be10c463de9
2016-04-07 16:48:01 +00:00
Robin Lee
1b83651e7f Merge "Internal API for system apps to determine default network for other apps" into nyc-dev 2016-04-07 16:43:15 +00:00
Makoto Onuki
3443670828 Fix sqlite time measurement.
SystemClock.uptimeMillis() should be used to calculate duration.

Bug 28054535

Change-Id: Idadee1ee47cea22d58dba2163cb843402e39b196
2016-04-07 09:42:17 -07:00
Oren Blasberg
1b65b01f93 Merge "Fix icon spacing on both MenuPopup implementations." into nyc-dev 2016-04-07 16:37:47 +00:00
Phil Weaver
d408b995c3 Merge "Allow tests to change UiAutomation flags." into nyc-dev 2016-04-07 16:35:27 +00:00
Ricky Wai
d48a049fa3 Merge "Fix work profile screen timeout policy" into nyc-dev am: bdc3961
am: 869ecf2

* commit '869ecf225a6c6adb5d5dfe738e6d24ee0f41b1e7':
  Fix work profile screen timeout policy

Change-Id: I9664923b282f7b19f7a5a780977dedafa763d343
2016-04-07 16:31:23 +00:00
Ricky Wai
869ecf225a Merge "Fix work profile screen timeout policy" into nyc-dev
am: bdc3961

* commit 'bdc3961fef7b57f98bd6091b79fb511081237d8e':
  Fix work profile screen timeout policy

Change-Id: I4ebf3e47cfadcfe3f689e28f2a487c384278fb83
2016-04-07 16:28:00 +00:00
Ricky Wai
035e924470 Fix work profile screen timeout policy
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.

Bug: 27493348
Change-Id: Ia1ec1cafc7665c54816833af64e0f446a77a55b2
2016-04-07 17:16:03 +01:00
Ricky Wai
a2438d1f67 Delete all work fingerprints when unified lock changes to None/Swipe am: f86f986
am: c5de901

* commit 'c5de9018b2a76b2df1b30833bade5cb57245f350':
  Delete all work fingerprints when unified lock changes to None/Swipe

Change-Id: I3d0e64e419afcfccdb27d859480d12eac70803c4
2016-04-07 15:53:31 +00:00
Ricky Wai
c5de9018b2 Delete all work fingerprints when unified lock changes to None/Swipe
am: f86f986

* commit 'f86f986728b5844a48e2e7bbd4927d2f5500c682':
  Delete all work fingerprints when unified lock changes to None/Swipe

Change-Id: I683d05a106119af74fe920b37be4e26e158e5cbc
2016-04-07 15:50:06 +00:00
Ricky Wai
f86f986728 Delete all work fingerprints when unified lock changes to None/Swipe
Bug: 27551139
Change-Id: Ida398a922d9c42e65001b0a10e13552505824d2d
2016-04-07 15:40:54 +00:00
Ricky Wai
2d1878c0d6 Fingerprint should confirm device lock when unified am: 53940d4
am: d18d149

* commit 'd18d14950926ea9ca4947955772053247530404a':
  Fingerprint should confirm device lock when unified

Change-Id: I3a3649cf493a3f594c69220e08860d8e1ed3a0d9
2016-04-07 15:40:05 +00:00
Ricky Wai
d18d149509 Fingerprint should confirm device lock when unified
am: 53940d4

* commit '53940d4c7f45a26d8b571982a1f8f4b8094aa5e0':
  Fingerprint should confirm device lock when unified

Change-Id: Ic4849d86219fc528862fb50e0670a243ddd60868
2016-04-07 15:36:48 +00:00
Ricky Wai
53940d4c7f Fingerprint should confirm device lock when unified
When unified and adding a fingerprint, the user is prompted to set up
a backup

Bug:27419438
Change-Id: I3e857fa07c50ee0904f685b721595ef6cfe729f9
2016-04-07 15:11:34 +00:00
Robin Lee
d2baf792f8 Internal API for system apps to determine default network for other apps
Callers with CONNECTIVITY_INTERNAL permission can read off the netId
that an application is assigned to by default.

Necessary for making connections as the default network for a client
app eg. when downloading stuff on its behalf.

Bug: 27074270
Change-Id: I8d35e8e99126875f55f3c545090326f3e9be43fb
2016-04-07 14:55:59 +00:00
Ricky Wai
93673ce9b7 Keymaster init for work profile am: dc283a8
am: e28ff22

* commit 'e28ff22bc4b213fe78dc50c0cf620569925392c7':
  Keymaster init for work profile

Change-Id: Ic3febb501b2929dea1411de2f2bdb690f7117572
2016-04-07 14:32:13 +00:00
Ricky Wai
e28ff22bc4 Keymaster init for work profile
am: dc283a8

* commit 'dc283a897680ffd33c4d15535ebe778ba5b42c43':
  Keymaster init for work profile

Change-Id: I131c93404eca82fa174527c6f2fb4a8aa72f7b35
2016-04-07 14:28:55 +00:00
Ricky Wai
dc283a8976 Keymaster init for work profile
Changes:
(1) When unified work challenge is enabled and screen lock is secure
  - Store work profile secure key in primary profile
  - When primary user keystore unlocked, unlock work profile keystore
  - When primary user change lock to none, remove work secure key
(2) When unified work challenge is enabled but screen lock is not secure
  - When screen lock changes to secure, store work secure key in primary
(3) When user changes work challenge from unified to separated
  - Remove work secure key in primary
(4) When user changes work challenge from separate to unified
  - Do (1) and (2)

Bug: 27460698

Change-Id: I8f77bde5dc6b8e59c90256e75c5990100e93366b
2016-04-07 14:23:37 +00:00
Ashutosh Joshi
d0cb6cecdb Merge "Add dumpsys capabilities for context hub service" into nyc-dev am: 7d4a7fa
am: 0174e54

* commit '0174e54e8c2b1432be41dff4029adbb49fafcecb':
  Add dumpsys capabilities for context hub service

Change-Id: I293b86e31d5f54c37eb60fefee9ed9dc4bd9c0ee
2016-04-07 14:09:36 +00:00
Ashutosh Joshi
0174e54e8c Merge "Add dumpsys capabilities for context hub service" into nyc-dev
am: 7d4a7fa

* commit '7d4a7fa333c4d73ed36d3729b43a5f3ae82cdc93':
  Add dumpsys capabilities for context hub service

Change-Id: Iabe5f35caa73bdb8beccc6d5e3596a0478a62266
2016-04-07 14:06:16 +00:00
Alexander Hills
e9765a3c3a Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev am: a5ec16e
am: 9f1e6de

* commit '9f1e6de054f836e3b35bb96998c1400435cd5d7a':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: If09863a35440db6b0fc10c021226c9b61b52283f
2016-04-07 14:03:06 +00:00
Ashutosh Joshi
7d4a7fa333 Merge "Add dumpsys capabilities for context hub service" into nyc-dev 2016-04-07 14:00:49 +00:00
Alex Hills
9f1e6de054 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev
am: a5ec16e

* commit 'a5ec16e367637ba0638f906615cbfef6f4d85d13':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: I7af69f8e647d055a2ee9e0ac66aec7d9ee140f0b
2016-04-07 13:59:56 +00:00
Alexander Hills
a5ec16e367 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev 2016-04-07 13:52:58 +00:00
Seigo Nonaka
6245395c04 Merge "Fix suggestion popup for RTL text on LTR layout." into nyc-dev am: 64d1515
am: a0d2425

* commit 'a0d242572e1cf2ded145edeb9d6d8d331cf46fc8':
  Fix suggestion popup for RTL text on LTR layout.

Change-Id: I00b52e18af2faf00c987fe6414c944f2f96e0be7
2016-04-07 09:31:10 +00:00
Seigo Nonaka
a0d242572e Merge "Fix suggestion popup for RTL text on LTR layout." into nyc-dev
am: 64d1515

* commit '64d151507601a6472f85c96d105e2555b7ad221f':
  Fix suggestion popup for RTL text on LTR layout.

Change-Id: I5c2a98e6d7a55c463ec1aea00729d70294aa0e29
2016-04-07 09:27:45 +00:00
Seigo Nonaka
64d1515076 Merge "Fix suggestion popup for RTL text on LTR layout." into nyc-dev 2016-04-07 09:20:27 +00:00