221737 Commits

Author SHA1 Message Date
Doris Liu
be2187a175 Merge "Add hooks in JNI to start using native path parsing" 2015-11-12 01:56:06 +00:00
Doris Liu
cdd23f9d45 Add hooks in JNI to start using native path parsing
Change-Id: Iaa0d3c2c1936c248146ed7f186a13e8e79be818e
2015-11-11 17:54:52 -08:00
Erik Kline
ca596c6e07 Merge "Lower NTP timeout from 20 seconds down to 5 seconds" 2015-11-12 01:45:00 +00:00
Makoto Onuki
54b5f25b85 Merge "Revert "Do not call into ActivityManager from DPMS within DPMS lock"" 2015-11-12 01:39:44 +00:00
Makoto Onuki
219bbafc3f Revert "Do not call into ActivityManager from DPMS within DPMS lock"
Bug 25567963

This reverts commit 53de36f9c40c9a4ac1eb9cca8f458aa6c998c1fd.

Change-Id: I4faaa0b4c50d75e208f37b99bc1d6e2f0fff8127
2015-11-12 01:38:47 +00:00
Eino-Ville Talvala
78c90c2376 Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 am: 0e57a4d021 am: 7a062ed396
am: 184cefc2ae

* commit '184cefc2ae33dde0d82a2ee4ed2683b05df9ccc3':
  Camera: Documentation updates
2015-11-12 01:38:37 +00:00
Eino-Ville Talvala
184cefc2ae Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 am: 0e57a4d021
am: 7a062ed396

* commit '7a062ed396f6e563766367de70e0d9c6ba615fed':
  Camera: Documentation updates
2015-11-12 01:31:30 +00:00
Eino-Ville Talvala
7a062ed396 Camera: Documentation updates am: d8407271ff am: 37e78cf8f1
am: 0e57a4d021

* commit '0e57a4d02199a55db763b10a49f383c395e768c7':
  Camera: Documentation updates
2015-11-12 01:25:02 +00:00
Eino-Ville Talvala
0e57a4d021 Camera: Documentation updates am: d8407271ff
am: 37e78cf8f1

* commit '37e78cf8f18523cda95926a85ae2b3678ffd7e5e':
  Camera: Documentation updates
2015-11-12 01:18:12 +00:00
Eino-Ville Talvala
37e78cf8f1 Camera: Documentation updates
am: d8407271ff

* commit 'd8407271ffa83d27e9a524f485a0799e422e1fd6':
  Camera: Documentation updates
2015-11-12 01:10:07 +00:00
Amith Yamasani
7fdc58866f Merge "Use correct lock for reading/writing usage stats files" 2015-11-12 00:46:49 +00:00
Jeff Sharkey
7d0b9856fc Merge "More file-based encryption work." 2015-11-12 00:20:27 +00:00
Eino-Ville Talvala
d8407271ff Camera: Documentation updates
- Clarify hardware.camera feature being only for the back camera
 - Clarify what setting a CaptureRequest field to null does
 - Use preCorrectionActiveArray instead of activeArray in list of
   possible raw output sizes
 - Clarify length of GPS processing field for camera1 API

Bug: 24540625
Bug: 23908116
Bug: 23051627
Bug: 17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
2015-11-11 23:59:38 +00:00
Daniel Koulomzin
37079993a1 Merge "ActivityView gets its own thread pool." into cw-e-dev am: 1090acc958 am: 102e66152a
am: c549b4fbc4

* commit 'c549b4fbc4fc9330f72050bf92a21ef3e48446e8':
  ActivityView gets its own thread pool.
2015-11-11 23:44:26 +00:00
Daniel Koulomzin
c549b4fbc4 Merge "ActivityView gets its own thread pool." into cw-e-dev am: 1090acc958
am: 102e66152a

* commit '102e66152a51e28920da23e2991281f51f2439ee':
  ActivityView gets its own thread pool.
2015-11-11 23:37:13 +00:00
Daniel Koulomzin
102e66152a Merge "ActivityView gets its own thread pool." into cw-e-dev
am: 1090acc958

* commit '1090acc958add85c1332fc73b66258ea4efba69e':
  ActivityView gets its own thread pool.
2015-11-11 23:28:10 +00:00
Daniel Koulomzin
1090acc958 Merge "ActivityView gets its own thread pool." into cw-e-dev 2015-11-11 23:23:18 +00:00
Daniel Koulomzin
71c012e001 ActivityView gets its own thread pool.
Bug: 24316798

Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
2015-11-11 18:21:57 -05:00
Ian Pedowitz
c9711721f3 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 am: 4f22c781b6 am: 44df02fc17
am: 4ab979e6cc

* commit '4ab979e6cc0c63b97b79441b478e30c8febdc3ee':
  Revert "Fix race condition when setting default ringtones"
2015-11-11 22:13:11 +00:00
Ian Pedowitz
4ab979e6cc Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 am: 4f22c781b6
am: 44df02fc17

* commit '44df02fc17bb0f3f1c445166c6cbd7f4d92b4eb6':
  Revert "Fix race condition when setting default ringtones"
2015-11-11 22:04:28 +00:00
Ian Pedowitz
44df02fc17 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001
am: 4f22c781b6

* commit '4f22c781b614322fe3790d314a527ac10471a63a':
  Revert "Fix race condition when setting default ringtones"
2015-11-11 21:54:42 +00:00
Chong Zhang
14c040bdd9 Merge "Fixes for dim bounds and touch bounds" 2015-11-11 21:50:56 +00:00
Ian Pedowitz
4f22c781b6 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev
am: 88d4cc1001

* commit '88d4cc100175a54be3b7d560a91c38197f59f4bf':
  Revert "Fix race condition when setting default ringtones"
2015-11-11 21:46:06 +00:00
Ian Pedowitz
88d4cc1001 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev 2015-11-11 21:39:11 +00:00
Ian Pedowitz
05ce0c6bb0 Revert "Fix race condition when setting default ringtones"
This reverts commit f2cb9341ff864e6d9cc6797857665b2281643a74.

Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
2015-11-11 21:38:04 +00:00
Rob Carr
1bc5d9b3d4 Merge "Prevent early recent trimming of distinct documents." 2015-11-11 21:04:35 +00:00
Chong Zhang
4c9ba52aca Fixes for dim bounds and touch bounds
- Change dimming and touch related usage to use task's "max visible
  bounds", which is the app within a task that's covering the maximum
  visible area looking down from top. This solves the problem where
  an app pops up a dialog window. We should dimming (and allow touch)
  the entire task area, not just the dialog's visible area.

- Fix initial bounds used in drag moving/resizing, this should be
  visible bounds of the app main window, not the original task bounds.

- Fix touch region set up for freeform apps, even when task is not
  full screen, we should get the max visible bounds first (as freeform
  app could have dialogs too).

bug: 25494928
bug: 25487005
bug: 25613403

Change-Id: Ib1c6a1665fb83ded2fcb0a7ea92cf1def5372edd
2015-11-11 13:03:39 -08:00
Amith Yamasani
ccf7d9e8ce Use correct lock for reading/writing usage stats files
Bug: 25355086
Change-Id: I65946e5afa841215f161fc25ad70b31a108a33c3
2015-11-11 12:53:26 -08:00
Chad Brubaker
669692234b Merge "Add NetworkSecurityConfigProvider" am: d1c469e876 am: 8c89f4d28c
am: 70b2eede18

* commit '70b2eede18476f3a7d6344ffdc18b40f07bf4b5f':
  Add NetworkSecurityConfigProvider
2015-11-11 20:46:48 +00:00
Amith Yamasani
bdb94fe2ce Merge "Fix system watchdog timeout when reading too many usage events." am: 10b0bae06f am: b3d48f18a9
am: f12ffe6d76

* commit 'f12ffe6d762f281cbda56322be83a1da80b707ea':
  Fix system watchdog timeout when reading too many usage events.
2015-11-11 20:45:29 +00:00
Chad Brubaker
70b2eede18 Merge "Add NetworkSecurityConfigProvider" am: d1c469e876
am: 8c89f4d28c

* commit '8c89f4d28c927ffe81c6e46159d0e5d3a0dd2986':
  Add NetworkSecurityConfigProvider
2015-11-11 20:39:35 +00:00
Amith Yamasani
f12ffe6d76 Merge "Fix system watchdog timeout when reading too many usage events." am: 10b0bae06f
am: b3d48f18a9

* commit 'b3d48f18a94c586823462c93fc0f739c83f3db78':
  Fix system watchdog timeout when reading too many usage events.
2015-11-11 20:38:15 +00:00
Chad Brubaker
8c89f4d28c Merge "Add NetworkSecurityConfigProvider"
am: d1c469e876

* commit 'd1c469e8769822c48584034076861331fd792a7c':
  Add NetworkSecurityConfigProvider
2015-11-11 20:32:03 +00:00
Amith Yamasani
b3d48f18a9 Merge "Fix system watchdog timeout when reading too many usage events."
am: 10b0bae06f

* commit '10b0bae06ffdeb79494ddd1aff19387b56770960':
  Fix system watchdog timeout when reading too many usage events.
2015-11-11 20:30:32 +00:00
Chad Brubaker
d1c469e876 Merge "Add NetworkSecurityConfigProvider" 2015-11-11 20:25:04 +00:00
Amith Yamasani
10b0bae06f Merge "Fix system watchdog timeout when reading too many usage events." 2015-11-11 20:24:39 +00:00
Filip Gruszczynski
0fecb5b008 Merge "Fix thumbnail animation appearing on going home transition." 2015-11-11 20:07:58 +00:00
Filip Gruszczynski
f74359d606 Fix thumbnail animation appearing on going home transition.
We were not dilligent enough about clearing old state in AppTransition,
so parts of old overrides would bleed to the new state. In order to
improve the situation, we have now a single clear method, that will
clear all state that should be restricted to a single transition.

Bug: 25630796
Change-Id: Icb402d05aaa2d1bd356d55e43502442d8fd8cd23
2015-11-11 12:06:42 -08:00
Amith Yamasani
536258c531 Merge "Once system is provisioned, lock the screen on system user" 2015-11-11 20:05:06 +00:00
Alan Viverette
63098f4ded Merge "Pass densityDpi into RippleComponent, store as densityScale" 2015-11-11 20:00:22 +00:00
Wale Ogunwale
7790fda948 Merge "Set right bounds/configuration for task when positioned in stack." 2015-11-11 19:41:33 +00:00
Chad Brubaker
7d78ffcd7f Merge "Add support for debug-overrides configuration" am: f1e813ea33 am: 467804448d
am: 3210b8b4da

* commit '3210b8b4da3c745420d3010028f2bb7071044262':
  Add support for debug-overrides configuration
2015-11-11 19:38:13 +00:00
Chad Brubaker
3210b8b4da Merge "Add support for debug-overrides configuration" am: f1e813ea33
am: 467804448d

* commit '467804448d6b13e04b4d9bc20fd195baa1f07e90':
  Add support for debug-overrides configuration
2015-11-11 19:30:01 +00:00
Chad Brubaker
467804448d Merge "Add support for debug-overrides configuration"
am: f1e813ea33

* commit 'f1e813ea334c947ae0397bfa3a8e42be4fd4ae8c':
  Add support for debug-overrides configuration
2015-11-11 19:21:32 +00:00
Chad Brubaker
f1e813ea33 Merge "Add support for debug-overrides configuration" 2015-11-11 19:03:30 +00:00
Amith Yamasani
cb15d66f1c Once system is provisioned, lock the screen on system user
If the device provisioning is complete, check if we need to show
the keyguard. We don't want it to show launcher after finishing
with setupwizard in the system user.

Bug: 25326078

Change-Id: I326069e29122ebf19a59fc00a9120cd5de70f231
2015-11-11 10:58:29 -08:00
Chad Brubaker
5a1078f40d Add NetworkSecurityConfigProvider
Change-Id: I321e3ca94cc2a8d5e0e5d82a83b255ff5b8a71d2
2015-11-11 10:54:54 -08:00
Jeff Sharkey
f9fc6d6cc0 More file-based encryption work.
Add granular StorageManager APIs for key creation/destruction and
unlocking/locking.  Start passing through an opaque token as part
of the unlock command, but leave it empty for now.  We now have a
separate "prepare" method that sanity checks that user directories
are correctly setup.

Define a handful of system properties used for marking devices that
should be operating in FBE mode, and if they're emulating FBE.  Wire
a command to "sm", but persisting will come later.

Start using new "encryptionAware" flag on apps previously marked with
coreApp flag, which were apps running in the legacy CryptKeeper
model.  Small tweaks to handle non-encryptionAware voice interaction
services.  Switch PackageManager to consult StorageManager about the
unlocked state of a user.

Bug: 22358539
Change-Id: Ic2865f9b81c10ea39369c441422f7427a3c3c3d6
2015-11-11 10:47:23 -08:00
Svetoslav Ganov
d07d7aff0b Merge "Add the set_test a11y action to EditText's action list" 2015-11-11 18:41:37 +00:00
Philip P. Moltmann
ab2ee47d01 Merge "Allow ellipsizing of copy count and media size in PrintActivity main view." 2015-11-11 18:40:39 +00:00