drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
221,928 Commits 1 Branch 0 Tags
Commit Graph

221928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chad Brubaker
bfcd67f71e Use duck typing in X509TrustManagerExtensions 
X509TrustManagerExtensions assumes that the default X509TrustManager is
an instance of conscrypt's TrustManagerImpl. That's no longer going to
always be the case. Instead use duck typing to support any
X509TrustManagers that have the extra methods required for
X509TrustManagerExtensions.

Change-Id: If23471bda590d5e131bb1e802a60599957bc7f37
 2015-11-11 13:38:33 -08: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
Chris Craik
d3daa3198e Add shadow support to new reorderer/renderer 
Doesn't yet use correct lighting info (esp. in layers), or
tessellate shadows asynchronously

Change-Id: I9ccec24b28869be42138a9bb234b1af874291a44
 2015-11-11 13:32:37 -08: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
Philip P. Moltmann
3aa1fc5aec Allow ellipsizing of copy count and media size in PrintActivity main view. 
Bug: 25589299
Change-Id: I231c156de1180b18a140ee8ad896bd4226196bc9
 2015-11-11 10:30:21 -08:00
Geoff Mendal
d64951b483 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: efa66ca345 -s ours am: bdc6cd2930 -s ours 
am: 6035d3d256  -s ours

* commit '6035d3d256c9f8e71cdf41a1c6d98afc7d56d1e4':
  Import translations. DO NOT MERGE
 2015-11-11 18:18:56 +00:00
John Reck
7d9eb2aeb0 Merge "Fix memory corruption in SpotShadow" am: 8c85c00b5e am: 8c8353a8c3 
am: 5bb2fdb425

* commit '5bb2fdb425dab346fb83c7f2bf9afa03bdf79fd6':
  Fix memory corruption in SpotShadow
 2015-11-11 18:17:25 +00:00
Geoff Mendal
6035d3d256 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: efa66ca345 -s ours 
am: bdc6cd2930  -s ours

* commit 'bdc6cd29303b12ca2fcd8e865f1bb6550b01652f':
  Import translations. DO NOT MERGE
 2015-11-11 18:12:37 +00:00
John Reck
5bb2fdb425 Merge "Fix memory corruption in SpotShadow" am: 8c85c00b5e 
am: 8c8353a8c3

* commit '8c8353a8c3152bc3ee4b74815d64c65c2c9d1991':
  Fix memory corruption in SpotShadow
 2015-11-11 18:08:15 +00:00
Geoff Mendal
bdc6cd2930 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: efa66ca345  -s ours

* commit 'efa66ca345bc9c82e9f4c88e4e902f935804ab73':
  Import translations. DO NOT MERGE
 2015-11-11 18:03:38 +00:00
Geoff Mendal
3cc97f524a Import translations. DO NOT MERGE am: 984f7fb960 -s ours am: adaccf62be -s ours am: d00e9f88d7 -s ours 
am: 3c8f7b53da  -s ours

* commit '3c8f7b53dae22d5ad8d28a48259eca9f83c66226':
  Import translations. DO NOT MERGE
 2015-11-11 17:59:16 +00:00
John Reck
8c8353a8c3 Merge "Fix memory corruption in SpotShadow" 
am: 8c85c00b5e

* commit '8c85c00b5e8fffb226f4af225a67425b8d0f190b':
  Fix memory corruption in SpotShadow
 2015-11-11 17:59:16 +00:00
Geoff Mendal
efa66ca345 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-11 17:56:56 +00:00
John Reck
8c85c00b5e Merge "Fix memory corruption in SpotShadow" 2015-11-11 17:52:08 +00:00
Alan Viverette
bd5294bcb8 Pass densityDpi into RippleComponent, store as densityScale 
Fixes a regression where the foreground was created against the density
in DPI rather than as a scale factor.

Bug: 25602850
Change-Id: Ia871aa5def4319682a73228efb599f31b65afdb6
 2015-11-11 12:51:10 -05:00
Geoff Mendal
3c8f7b53da Import translations. DO NOT MERGE am: 984f7fb960 -s ours am: adaccf62be -s ours 
am: d00e9f88d7  -s ours

* commit 'd00e9f88d704c713a313c18a2f5bc37986e7d6e3':
  Import translations. DO NOT MERGE
 2015-11-11 17:49:48 +00:00
Winson
a7df77155d DO NOT MERGE Ensure that the device is provisioned before showing Recents. 
Bug: 25476219

Change-Id: Ibbe621748f7275f8c1ccded84612ca16292559eb
 2015-11-11 17:48:34 +00:00
Winson
16a76dadcc DO NOT MERGE Ensure that the device is provisioned before showing Recents. 
Bug: 25476219
Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
 2015-11-11 17:47:55 +00:00
Geoff Mendal
d00e9f88d7 Import translations. DO NOT MERGE am: 984f7fb960 -s ours 
am: adaccf62be  -s ours

* commit 'adaccf62be5c8b1f44f5dd0c03bff01a2b314896':
  Import translations. DO NOT MERGE
 2015-11-11 17:41:18 +00:00
Geoff Mendal
ead61cca62 Import translations. DO NOT MERGE 
Change-Id: If1583a01724c6eb81c234b7f2b71c7f276d67a13
Auto-generated-cl: translation import
 2015-11-11 18:41:18 +01:00
Geoff Mendal
adaccf62be Import translations. DO NOT MERGE 
am: 984f7fb960  -s ours

* commit '984f7fb9603b55d3031f7df04fa37010513b712c':
  Import translations. DO NOT MERGE
 2015-11-11 17:32:10 +00:00
Winson Chung
cef9219fda Merge "Fixing issue with wrong transition when tasks are offscreen." 2015-11-11 17:30:24 +00:00