221615 Commits

Author SHA1 Message Date
Jim Miller
d72d5ac598 Log fingerprint state in KeyguardUpdateMonitor.
Attempt to track down bug 24508587

Change-Id: Ifb998e2752ec515c36dd302c2abeb1ab27f3a2f3
2015-11-07 00:48:33 +00:00
Suprabh Shukla
a50a8ec06f Merge "Fixing recent tasks not getting restored at startup" 2015-11-07 00:44:18 +00:00
Adam Lesinski
b274e35abf AAPT2: Fix inclusion of comments in R.java javadoc
Comments weren't being copied when merged from the various
resource tables.

Also refactored the JavaClassGenerator to omit a class
if no entries exist for it.

Change-Id: I6eaa89b7b3715bc05403635a2baf0d1db3efd142
2015-11-06 16:37:57 -08:00
Suprabh Shukla
74f9f165c2 Fixing recent tasks not getting restored at startup
Check for empty list before reading activity at index 0.

Change-Id: If87e3c4d2cedd86fdb427ddfb27d1f32f8f93412
2015-11-07 00:15:31 +00:00
Tao Bai
788f7433bd Merge "Add test to cover loading shared-lib with appAsLib as true. This patch made AppAsLib_test use its own resource" 2015-11-06 23:49:40 +00:00
Winson
13d30660ef Fixing issue with canceling the thumbnail in addition to the app window.
Bug: 25392381
Change-Id: Ib507f53bcd2aad4771c2546f5e8bfe771769e9a2
2015-11-06 15:30:29 -08:00
Winson
7395ef0cdb Reverting debug flag.
Change-Id: I918d43827ecd7be52b41fb632850775161aa3902
2015-11-06 14:54:41 -08:00
Tao Bai
dd337646a9 Using addAssetPathAsSharedLibrary to load asset.
This will alllow framework to overrdie the resource id even the
package resource is app.

Change-Id: I176166e7c51ceb5e84101deb3f467a826f484251
2015-11-06 14:43:12 -08:00
Winson
6b92c6e524 Adding fast alt-tab trigger to prevent full animation.
Change-Id: I3df7a99977d0c2687eea084a95a0953429e8ff47
2015-11-06 14:42:14 -08:00
Tao Bai
1375e5f180 Add test to cover loading shared-lib with appAsLib as true.
This patch made AppAsLib_test use its own resource

Bug 22487604

Change-Id: Iac4cc949f1b25c326a287a49e0b031bf6831e9e9
2015-11-06 14:33:49 -08:00
Makoto Onuki
9e935a3bc9 Make sure to persist user restrictions in UMS
Bug 25565111

Change-Id: Ic48ce728a1c2b55d70276a37b9a359407167edf1
2015-11-06 14:24:24 -08:00
Winson
1b58561f66 Fixing up some more focus edge cases.
- Disallow touch while alt-tabbing
- Allow keyboard to focus tab while scrolling
- Cleaning up some old classes that aren’t really being used

Change-Id: Ibabea093afb711b07f398677d25735421b7c7e53
2015-11-06 13:48:45 -08:00
Chad Brubaker
6e92454065 Merge "Fix directory check in UserCertificateSource" am: 1483ee3aa5 am: 2d7d8401a9
am: a8fd356640

* commit 'a8fd35664070134f0596238ad0c5bdaa3adc221b':
  Fix directory check in UserCertificateSource
2015-11-06 21:28:24 +00:00
Chad Brubaker
52fe096d86 Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3 am: dd6d0918c4
am: a21b4a528d

* commit 'a21b4a528dc7c728b3546899c90758d583f35495':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:26:55 +00:00
Chad Brubaker
74e67e04a5 Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697 am: 478fad3cf5
am: 54b4b8fdfc

* commit '54b4b8fdfc336b8a4902637e622c3ede879edcde':
  Use a builder for NetworkSecurityConfig
2015-11-06 21:25:31 +00:00
Chad Brubaker
a8fd356640 Merge "Fix directory check in UserCertificateSource" am: 1483ee3aa5
am: 2d7d8401a9

* commit '2d7d8401a9c1e03f8f141415b25cfb415df73695':
  Fix directory check in UserCertificateSource
2015-11-06 21:19:02 +00:00
Alan Viverette
9db60f4e5b Merge "Mutate DrawableContainer children immediately after inflation" 2015-11-06 21:17:36 +00:00
Chad Brubaker
a21b4a528d Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3
am: dd6d0918c4

* commit 'dd6d0918c42aec3fb08d6df15822078e35cc4f33':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:17:34 +00:00
Chad Brubaker
2d7d8401a9 Merge "Fix directory check in UserCertificateSource"
am: 1483ee3aa5

* commit '1483ee3aa5737f9aff06021b5ec9fe3086ee2e66':
  Fix directory check in UserCertificateSource
2015-11-06 21:10:54 +00:00
Chad Brubaker
dd6d0918c4 Merge "Fix incorrect hasPerDomainConfigs check"
am: c5c51dafb3

* commit 'c5c51dafb3ede95622eb350dae0b662abb611925':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:09:11 +00:00
Jorim Jaggi
c97ba49d23 Update divider shadow when it is moving
Change-Id: Ifc67ba3ee640929248cad6479d9c0df818e32f40
2015-11-06 21:08:57 +00:00
Chad Brubaker
1483ee3aa5 Merge "Fix directory check in UserCertificateSource" 2015-11-06 21:02:23 +00:00
Chad Brubaker
c5c51dafb3 Merge "Fix incorrect hasPerDomainConfigs check" 2015-11-06 21:02:01 +00:00
Chad Brubaker
b0f8b4bb35 Fix directory check in UserCertificateSource
If the user has not added any CAs to the user trust store the user-added
directory will not have been created.

Change-Id: I8b5f73af3c0761c56969874231004fedbf7badda
2015-11-06 13:00:15 -08:00
Chad Brubaker
35de8d6d2b Fix incorrect hasPerDomainConfigs check
Change-Id: Iaeedbbcc5f12475d346a77dba84b38a1d3d8d346
2015-11-06 12:50:31 -08:00
Jorim Jaggi
1a2f3ab485 Fix build
Change-Id: Ie716bbec49920af459ceddf8e51387ccf5946a7f
2015-11-06 20:35:00 +00:00
Chad Brubaker
54b4b8fdfc Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697
am: 478fad3cf5

* commit '478fad3cf53874f9cc96169cd25b29b9c031637a':
  Use a builder for NetworkSecurityConfig
2015-11-06 20:31:02 +00:00
Chad Brubaker
478fad3cf5 Merge "Use a builder for NetworkSecurityConfig"
am: 7e98f2e697

* commit '7e98f2e6976fb38c5c3a7421547d1756ba5faafe':
  Use a builder for NetworkSecurityConfig
2015-11-06 20:25:33 +00:00
Jorim Jaggi
ea1e8ecf5e Don't kill process when dismissing stack
Also clear the binder identity to incorrect permission
checks, which lead to crashes when dismissing the docked
stack.

Change-Id: I53175769745e8bbdbc296806b9297eb3c53d4452
2015-11-06 20:23:23 +00:00
Alan Viverette
9b4bdeff6d Mutate DrawableContainer children immediately after inflation
Previously we would only mutate children when they were displayed, so
applyTheme() calls would be applied to the shared constant state. Now
we mutate() immediately after obtaining the child, which ensures we
have a clean constant state. This also allows us to remove extra
mutate() calls, since we know all child drawables are already mutated.

Bug: 25081461
Change-Id: I52390db268690a8e181f5b9bbe612b7ed6ce9359
2015-11-06 15:22:43 -05:00
Chad Brubaker
7e98f2e697 Merge "Use a builder for NetworkSecurityConfig" 2015-11-06 20:21:29 +00:00
Filip Gruszczynski
8f3978fc35 Merge "Fix windows disappearing when resizing freeform or docked." 2015-11-06 19:49:01 +00:00
Filip Gruszczynski
10a80e0b5b Fix windows disappearing when resizing freeform or docked.
Also includes some code clarity improvements: mHasSurface is set using a
setter, some fields get private.

Change-Id: I2f834880493c008fdccf07ff6ebfebd2e26690a9
2015-11-06 11:48:30 -08:00
Alan Viverette
22e27ccf79 Merge "Correctly handle child drawables with no intrinsic size" 2015-11-06 19:41:59 +00:00
Jorim Jaggi
aa5c3b2637 Merge changes I619be025,I126765a3,I0307c191,I9425785f,I623bd48d, ...
* changes:
  Restore changes lost during merge
  Fix flicker at the end of docked stack divider animation
  Implement divider UX interactions
  Immediately start resizing when touching docked divider
  Fix black holes and flickering in docked resizing
  Migrate docked divider drawing to SysUI
  Supply app transition specs with a future
2015-11-06 19:28:42 +00:00
Jorim Jaggi
e48f428b98 Restore changes lost during merge
Change-Id: I619be025988470e27b614ed0ad009e5d785f19eb
2015-11-06 20:25:49 +01:00
Alan Viverette
d5010c7df5 Merge "Use ConstantState directly instead of ConstantStateFuture" 2015-11-06 19:09:31 +00:00
Chris Elliott
c69a11fb7a DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours am: 634221adb2 am: 54919264d8
am: 8d19637651  -s ours

* commit '8d19637651d03fee04ad2b0e56d5a5502ab0c23e':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
2015-11-06 18:54:10 +00:00
Marco Nelissen
f2cb9341ff Fix race condition when setting default ringtones
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
2015-11-06 10:50:47 -08:00
Chris Elliott
8d19637651 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours am: 634221adb2
am: 54919264d8

* commit '54919264d8ab758a29c6d417d7bcd5a949c0b6e9':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
2015-11-06 18:46:32 +00:00
Chris Elliott
54919264d8 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours
am: 634221adb2

* commit '634221adb28f765233889cca32078e4b042198f3':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
2015-11-06 18:41:35 +00:00
Florin Malita
5e27140f48 Fix persistent Canvas clip handling
Partial Canvas save semantics (clip or matrix persisting after restore)
are currently emulated in the native canvas wrapper (SkiaCanvas.cpp).

Persistent clips (save w/ MATRIX_SAVE_FLAG only) in particular are
emulated using the SkCanvas clip stack.  There are two problems with
the current implementation:

1) The canvas save count is used to identify the clip stack topmost
frame, on the assumption that it is the same as the actual clip stack
save count.  But with the introduction of lazy SkCanvas saves in Skia,
the two values can diverge: the clip stack save count only reflects
*committed* saves, while the canvas save count includes both committed
and pending saves.  This means that we can no longer compare canvas and
clip stack save counts directly.

While we're looking at addressing the save count discrepancy in Skia
proper, we can also refactor the partial save emulation to no longer
rely on the two values being synchronized: instead of using the canvas
save count to locate the top clip stack frame, simply use the clip
stack save count for the same purpose - getClipStack()->getSaveCount()
always points to the correct top clip stack frame.

With this patch:

  * we use SkCanvas::getSaveCount() to track *canvas* save frames which
      require persistent matrix/clip handling (mSaveRecStack)
  * we use SkClipStack::getSaveCount() to extract the clips from the
    top clip stack frame

Also, since we're no longer mixing/comparing the two save counts, we
don't have to decrement the canvas value anymore (to make it zero-based
like its clip stack counterpart).

2) When iterating over clip stack elements, we currently start at
kTopIterStart and advance using next().  This is incorrect as next()
moves up the stack, so we only iterate over the topmost element =>
if there are multiple (non-consolidated) clip elements in the top
frame, we only get to see one.

We need to iterate using prev() instead.

Change-Id: Ic2d8cad684018925e749b9172fbf7c6202d9fb62
2015-11-06 18:40:25 +00:00
Chris Elliott
634221adb2 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
am: d9a2be8d3d  -s ours

* commit 'd9a2be8d3d5bd0e170fec71c316373e268a8c17f':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
2015-11-06 18:36:16 +00:00
Amith Yamasani
27e025b687 Allow activities to show on user 0 until provisioned
In a split-user mode, allow SUW and related apps to show UI
until the device is provisioned. Basically this changes the
logic a bit for when to force keyguard to always show on user 0.

Bug: 25326078
Change-Id: I8e862adae1c38efe9874479b532baa7446070035
2015-11-06 10:34:41 -08:00
Makoto Onuki
6d2beef6a8 Merge "Add DPM.getUserRestrictions()" 2015-11-06 18:32:35 +00:00
Makoto Onuki
3a3092fab0 Add DPM.getUserRestrictions()
This returns per-DO/PO restrictions.

Bug 23902097

Change-Id: I225c1b01444fe2f60e5a6674d327182cc9bb15dc
2015-11-06 10:30:08 -08:00
Makoto Onuki
86cd001e36 Merge "Have AudioService listen to DISALLOW_UNMUTE_MICROPHONE and" 2015-11-06 18:29:12 +00:00
Makoto Onuki
0953033842 Merge "Do not allow DO and PO running on the same user." 2015-11-06 18:28:55 +00:00
Chris Elliott
d9a2be8d3d DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
This reverts commit 7e19e286cc990daaafe934ed82ddfa00762907d6.

Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a
2015-11-06 17:41:17 +00:00
Todd Kennedy
71d1f399c2 Merge "Move 'un/install' to cmd" 2015-11-06 17:31:02 +00:00