183310 Commits

Author SHA1 Message Date
Joe Fernandez
f7224396ee am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528':
  docs: Android for Work developer landing page
2015-02-25 08:06:01 +00:00
Keisuke Kuroyanagi
434fcf1588 Merge "Paste as plain text by Ctrl-Shift-V" 2015-02-25 08:00:32 +00:00
Joe Fernandez
c427b721b6 am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page
2015-02-25 07:59:48 +00:00
Joe Fernandez
4141882623 Merge "docs: Android for Work developer landing page" into lmp-docs 2015-02-25 07:52:30 +00:00
Andrew Solovay
e64301e639 am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '790b1bc864d9066ff691b0e12a4e14ef85566c50':
  docs: New doc for creating an AfW Work Policy Controller
2015-02-25 07:49:37 +00:00
Andrew Solovay
790b1bc864 am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad':
  docs: New doc for creating an AfW Work Policy Controller
2015-02-25 07:42:44 +00:00
Andrew Solovay
d3cd0948c8 docs: New doc for creating an AfW Work Policy Controller
See first comment for doc stage location.

Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415
2015-02-24 23:31:41 -08:00
Jim Miller
bc4f2ccf6c Remove TrustAgent whitelisting API
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
2015-02-24 20:15:02 -08:00
Christopher Tate
6a873711cd Merge "Don't crash when backup timeout races with agent completion" 2015-02-25 02:30:37 +00:00
Wale Ogunwale
fa9ec310d8 Merge "Have AMS.setFocusedActivityLocked() move the focus stack to the front" 2015-02-25 01:55:32 +00:00
Christopher Tate
12f783d6c6 Don't crash when backup timeout races with agent completion
There's a narrow window of time in which an agent reporting that its
operation has completed races with timeouts such that we wind up
handling the completion callback just after certain fundamental state
has been reset.  Detect this race and proceed gracefully instead of
crashing.

Bug 19498669

Change-Id: I5a475527db1a55a8e567366ddfb10112e427682e
2015-02-24 17:37:54 -08:00
Wale Ogunwale
af0e448859 Have AMS.setFocusedActivityLocked() move the focus stack to the front
Bug: 19219490
Change-Id: I089c42a6cf6277f5975064103c9804c2ab05dcd6
2015-02-24 17:37:29 -08:00
Joe Fernandez
108ccac1a1 docs: Android for Work developer landing page
Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
2015-02-24 17:32:30 -08:00
Andrew Solovay
032e931a80 am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '6ffe1058463e5f4e65aa131796b37c0443d1b44b':
  docs: New "implementing app restrictions" doc
2015-02-25 01:14:58 +00:00
Christopher Tate
e266a9f8d1 Merge "Check DUMP permission in the backup service trampoline" 2015-02-25 01:11:34 +00:00
Andrew Solovay
6ffe105846 am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit 'a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c':
  docs: New "implementing app restrictions" doc
2015-02-25 01:07:25 +00:00
Rich Slogar
69044ae842 docs: note to install linux packages v2 update
b.android 155803

Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834
2015-02-24 17:01:58 -08:00
Andrew Solovay
a2ae6c9dbf Merge "docs: New "implementing app restrictions" doc" into lmp-docs 2015-02-25 01:01:56 +00:00
Filip Gruszczynski
23958c6e2f Force translucency from windowIsTranslucent on SwipeDismissLayout.
Bug: 18799741

Change-Id: Ifb05869f1bf080d7555d7728dc085c41cc2c277c
2015-02-24 16:59:45 -08:00
Chris Craik
a9ad0fc793 am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
* commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
  Explain behavior of boundless ripple projection
2015-02-25 00:26:51 +00:00
George Mount
42161c5cb4 Fix target location on nested shared elements.
Bug 19502062

When shared elements were nested, they *could* end in the wrong
location. Also, when the shared element transition was interrupted,
the final location was calculated incorrectly. This fixes
both conditions.

Change-Id: I23792507c1e9e96920721d38d7a2a21299f23112
2015-02-25 00:21:02 +00:00
Andrew Solovay
79cb98c6ce docs: New "implementing app restrictions" doc
New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.

Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac
2015-02-24 16:20:27 -08:00
Chris Craik
f2525ed3f4 am ea2a0648: Explain behavior of boundless ripple projection
* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection
2015-02-25 00:18:51 +00:00
Chris Craik
ea2a0648a8 Explain behavior of boundless ripple projection
Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
2015-02-25 00:12:38 +00:00
Christopher Tate
8dd7d01c1a Check DUMP permission in the backup service trampoline
Make sure that even if backup is disabled outright (and hence there
is no underlying service implementation for the trampoline to delegate
to), the DUMP permission exception is thrown as expected.

Bug 19422232

Change-Id: I6d1a17c5f85adcfad75af969b521920e786c05a8
2015-02-24 15:16:57 -08:00
Chong Zhang
cff41ae363 Merge "MediaRecorder: pass capture fps in float" 2015-02-24 22:22:11 +00:00
Sanket Padawe
ea4713d6e5 Changing usage of carrier name field of SubInfoRecord
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
2015-02-24 13:15:15 -08:00
Jeff Brown
a9e1c4e540 Merge "To help assess latency, dump the time a broadcast was enqueued." 2015-02-24 20:17:44 +00:00
Michael Wright
273fd8e49b Merge "Clean-up stale inputflinger binaries and associated libs." 2015-02-24 20:17:15 +00:00
Michael Wright
c14c26b3c7 Clean-up stale inputflinger binaries and associated libs.
Change-Id: I7ea2591e701140430ab2060ae0ce51af114c3acf
2015-02-24 12:11:37 -08:00
Jeff Brown
9fb3fd1d66 To help assess latency, dump the time a broadcast was enqueued.
Previously we only dumped the time when a broadcast started dispatch.
Start tracking the time when a broadcast was enqueued so that
we can determine whether the broadcast queue was stalled and for
how long.  Together with other information in the dump, this can help
to ascertain whether broadcast latency is being caused by the sender,
the dispatcher, or the receiver.

Bug: 17695520
Change-Id: I4f2e4bb92f9178f5d095b9124a15eb2e5f13b9f6
2015-02-24 19:59:16 +00:00
Craig Mautner
5d8a69f277 Merge "Cleanup the activity before the task and stack" 2015-02-24 19:36:08 +00:00
Craig Mautner
acebdc84d1 Cleanup the activity before the task and stack
The method cleanupActivityLocked() should be called before
removeActivityFromHistoryLocked(). Previously it didn't matter but
now that we null TaskRecord.stack when removing the last activity
from the task it does.

Fixes NPE in bug 19491381.

Change-Id: Ia6f8f560c0fe4df330577f313e24d7dd02c18409
2015-02-24 11:07:18 -08:00
Wale Ogunwale
9fc3cef1c7 Merge "Added ActivityManager API and AM command to resize a task." 2015-02-24 18:32:57 +00:00
Jorim Jaggi
df4943d5e0 Merge "Do not forceLayout when window is resized" 2015-02-24 18:13:23 +00:00
Jorim Jaggi
690bed268e Change status bar height to 24dp
Bug: 18410023
Change-Id: Ia8afcaddbf8d78372117806d2b6202cac0364ca9
2015-02-24 17:35:25 +00:00
Wale Ogunwale
53a29a90f3 Added ActivityManager API and AM command to resize a task.
Also fixed issue with ActivityStackSupervisor.moveTaskToStackLocked()
functionality not working correctly.

Change-Id: Ia13f1e92a7c59ce6543c226533ac8ea623488290
2015-02-24 09:33:18 -08:00
Fyodor Kupolov
b343d6db28 Allow alternative policy description for secondary users
For policies like wipe-data, device admin policy description should be
customizable for secondary users.

Bug: 19194766
Change-Id: Idadbdf84d378cf4f1b42ac246a48edbfa97eaa9a
2015-02-24 09:26:09 -08:00
John Spurlock
283dbfbd54 Merge "MediaProjectionPermissionActivity: Fix NPE." 2015-02-24 17:20:33 +00:00
John Spurlock
3d332f4e67 MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
2015-02-24 12:14:06 -05:00
Wale Ogunwale
d697ceac02 Improved back button behavior in multi-window mode.
Pressing the back button on the last activity in a stack that isn't
full screen causes the home stack to move forward and hide all other
visible stacks. This change allows the affected stack to be removed
while keeping the other stack visible.

Bug: 19423645
Change-Id: I30d84f84d525c114ee4993c1e4178af70fe47440
2015-02-24 08:24:58 -08:00
Adrian Roos
001b00d3bd Prevent regular processes from accessing the password history
Bug: 19019350
Change-Id: Iee410d62827fe0f9d43e08dd8869e8eea590382f
2015-02-24 17:16:44 +01:00
Jason Monk
de3260b5bf Keyguard: Use plmn/spn broadcast when no SIMs
The keyguard needs to show either 'emergency calls only' or 'no service'
depending on whether there is service available, so try to pull this from
the old sticky broadcast containing plmn/spn.

Bug: 19476978
Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001
2015-02-24 10:13:47 -05:00
James Cook
8ee1d64c0a Merge "Change UndoManager mOwners from HashMap to ArrayMap" 2015-02-24 14:55:51 +00:00
Jason Monk
08238bb624 Merge "Move non-ui bt settings code to SettingsLib" 2015-02-24 13:23:31 +00:00
Jason Monk
fb66b8ff48 Merge "Some Tethering code to SettingsLib and use in QS" 2015-02-24 13:16:27 +00:00
Narayan Kamath
23eeb2b8ae am 287c53f4: am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '287c53f4a8bade1cb6c2dd2fe858da9c303e3e3d':
  Track removal of refcounts from FileMap.
2015-02-24 13:09:55 +00:00
Narayan Kamath
287c53f4a8 am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '76507a64b530c757dc284f1f4d0807ffbfd9a701':
  Track removal of refcounts from FileMap.
2015-02-24 13:04:43 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
2015-02-24 12:56:52 +00:00
Narayan Kamath
72dc62ead2 Merge "Track removal of refcounts from FileMap." 2015-02-24 12:50:57 +00:00