Commit Graph

59961 Commits

Author SHA1 Message Date
Clara Bayarri
00a9b89085 Protect TrustManager.setDeviceLockedForUser with permission
Bug: 26535793
Change-Id: I172f1ec7d9285213ecd70564728c7328a3a675ff
2016-01-15 15:19:36 +00:00
Robin Lee
b68d2d5b68 Merge "Always-on app VPNs" 2016-01-14 11:37:18 +00:00
Chenjie Luo
5ffb219d80 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d am: 7034a6e2d0
am: af8c1b8f94

* commit 'af8c1b8f943f2c616c75da83b44063ae3a5f556f':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 06:13:43 +00:00
Chenjie Luo
af8c1b8f94 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d
am: 7034a6e2d0

* commit '7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:34:53 +00:00
Chenjie Luo
7034a6e2d0 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:29:13 +00:00
Daichi Hirono
cc1251b9b2 Merge "Change offset and size arguments of MtpDevice#getPartialObject to Java long." 2016-01-14 02:28:45 +00:00
Chenjie Luo
d5cea64d8d Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
am: 4a577bff96

* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:24:48 +00:00
Dongwon Kang
1ef6a06e11 Merge "Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED" 2016-01-14 02:16:23 +00:00
Dongwon Kang
32cb9ab5cc Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED
This addresses comments left in If506a533c5c7b567e770217a9430bf68b539677a

Change-Id: I6f952db6a8fa246d974bab556be3e21fe1b7f3da
2016-01-13 18:11:10 -08:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
2016-01-14 01:26:05 +00:00
Jorim Jaggi
fdbdb9f9c6 Merge changes I55d96ec3,I0ebc4639
* changes:
  Reenable task preloading in recents
  When creating docked stack, use SnapAlgorithm
2016-01-14 01:08:52 +00:00
Adam Lesinski
89a697a7e7 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b am: a5c7106017
am: 6a8c328d73

* commit '6a8c328d7386d19f4590dfbfc71338b1ec208fb7':
  UsageStats: Use new settings key idle_duration2 for app idle
2016-01-14 01:05:24 +00:00
Adam Lesinski
6a8c328d73 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b
am: a5c7106017

* commit 'a5c71060174c5357c75592998fb095e768eca8bd':
  UsageStats: Use new settings key idle_duration2 for app idle
2016-01-14 00:59:58 +00:00
Adam Lesinski
a5c7106017 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
am: d2e215978b

* commit 'd2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
  UsageStats: Use new settings key idle_duration2 for app idle
2016-01-14 00:54:10 +00:00
Adam Lesinski
d2e215978b Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 2016-01-14 00:45:31 +00:00
Daichi Hirono
2dd48256e9 Change offset and size arguments of MtpDevice#getPartialObject to Java
long.

To represents full range of 32-bit unsigned integer, we should use
jlong instead of jint.

BUG=26284424

Change-Id: Id3fa9e3daa778c204ab8e38f821d454c709c317a
2016-01-14 09:42:59 +09:00
Jorim Jaggi
d434dcbfc9 When creating docked stack, use SnapAlgorithm
To make sure the bounds snapped to a snap position are
set from the very beginning.

Change-Id: I0ebc463926dd17e0deeefc211b097f28a6456b96
2016-01-13 16:19:56 -08:00
Makoto Onuki
9bd64e2b88 Merge "API for blocked number provider" 2016-01-13 23:51:35 +00:00
Ian Pedowitz
46f890188c Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f am: 0cd5e9f475
am: 105108209f

* commit '105108209fc35b5029e5a728c09f6eaf91b8a940':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:21:05 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:10:29 +00:00
Ian Pedowitz
0cd5e9f475 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:01:29 +00:00
Ian Pedowitz
624d43b66f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 2016-01-13 22:47:45 +00:00
Yin-Chia Yeh
b99ed40fb0 Merge "Camera: cleanup dead code" 2016-01-13 21:50:02 +00:00
Alan Viverette
156bd49bdc Revert "Avoid drawable invalidation during draw()"
This reverts commit e5e59c6da4.

Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.

Bug: 26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
2016-01-13 21:49:10 +00:00
Samuel Tan
01208118b3 resolve merge conflicts of 3caecaec60 to master.
Change-Id: Ic3e9909c69f03a6ef1911a6b7589afbc02d7494f
2016-01-13 13:42:00 -08:00
Adam Lesinski
f0ef3c1126 UsageStats: Use new settings key idle_duration2 for app idle
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386

Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
2016-01-13 12:48:50 -08:00
Makoto Onuki
cbd0ed2944 API for blocked number provider
Bug 26232372

Change-Id: I4d243c00ab9f02af527a96d7b549abfe7876f565
2016-01-13 12:41:54 -08:00
Sandra Kwan
f56a60fab2 Merge "AccountManager: make account session APIs SystemApi." 2016-01-13 19:46:21 +00:00
Chet Haase
f73363cf51 Merge "Make Animation.cancel() actually work" 2016-01-13 19:30:29 +00:00
Jason Monk
561e219033 Merge "Round out the QS API" 2016-01-13 19:07:33 +00:00
Alan Viverette
7a66ba9ddb Merge "Clean up lint warnings in popup menu presenter classes" 2016-01-13 18:56:24 +00:00
Alan Viverette
02cd0f9105 Clean up lint warnings in popup menu presenter classes
Change-Id: I6b4cce1c4788b408615af0c93575e02e75b4c3ca
2016-01-13 13:33:17 -05:00
Dongwon Kang
ab064b3b36 Merge "Add a way for SystemUI to receive media resource (e.g. A/V codec) usage" 2016-01-13 18:21:00 +00:00
Clara Bayarri
4fce66668e Merge "Request Keyboard Shortcuts for SysUI Dialog via Window" 2016-01-13 18:06:38 +00:00
Robert Sesek
81d867f5db Merge "Add external services, a way to run isolated processes as a different package." 2016-01-13 17:23:36 +00:00
Clara Bayarri
75e097965c Request Keyboard Shortcuts for SysUI Dialog via Window
Keyboard shortcuts are requested via WindowManager, and
the request pipes through to the view root and the window
callback.

Bug: 22405482
Change-Id: Ic0071e91c7b554be3ac9df71e9539ee8a60e822e
2016-01-13 16:56:56 +00:00
Chet Haase
f83464ed0a Make Animation.cancel() actually work
Cancel() has apparently never worked. Calling cancel() results
in the startTime being set to Long.MIN_VALUE. In theory, this means that
on the next animation frame (getTransformation()), the elapsed time
(currentTime - startTime) should result in a large positive number, which
is way more than needed to prove that the elapsed fraction is >1 and
therefore that the animation has ended. But in practice, anything subtracting
MIN_VALUE will result in a large negative number due to Long wraparound, so the
end check fails and the animation continues. Forever.

Moreover, event fixing the cancel issue results in a repeating animation
continuing to repeat, because the logic was never there to determine whether
a repeating animation was canceled.

This fix addresses both issues, but in a minimal way. The risk in fixing this
for real is changing the behavior of cancel in a way that existing apps would not
expect. For example, it's weird that cancel causes one more frame to run. And even weirder
that it does so with a negative elapsed duration (resulting in an animation fraction of 0).
But I wouldn't want to change that behavior for fear that I'd break apps who rely on
that weird behavior.

Instead, there's a simple check for for the "expired" check and the "repeat?" check that
sees whether the startTime has the magic value of MIN_VALUE, which should only happen
when an animation has been canceled. If this is the case, it ensures that the animation ends.
For real.

Issue #24984018 canceled animation runs forever

Change-Id: Ia137eb04bd7df3976a4d9cef86fd39a78dc56f39
2016-01-13 07:37:29 -08:00
Alan Viverette
8a77da8626 Merge "Apply tick mark tint during view construction" 2016-01-13 15:16:11 +00:00
Alan Viverette
d154a5bb8d Apply tick mark tint during view construction
...otherwise it never gets applied.

Change-Id: I06991b3cedcf3dcfb8e98ae61e3d679c35b68839
2016-01-13 10:10:22 -05:00
Alan Treadway
fd53d56e38 Merge "Add extra to control USER_SETUP_COMPLETE behavior." 2016-01-13 14:07:38 +00:00
Clara Bayarri
8d35de8445 Fix missing MANAGE_USER error on calls to isDeviceSecure
A poorly placed clear identity was causing some crashes as
apps were required to have the MANAGE_USERS permission to
query if the current user is secured.

Change-Id: I1120b1e4405e78389fcbcb3e7d1dba8c80500da3
2016-01-13 13:21:03 +00:00
Alan Treadway
94de8c890c Add extra to control USER_SETUP_COMPLETE behavior.
For split-user cases it has been identified that provisioning
a profile-owner during user setup-wizard shouldn't cause
the setup-wizard to exit early generally. Adding this extra
allows a DPC to control whether the user can take further steps
in the setup-wizard after management provisioning completes.

Adding as a hidden extra since we don't expect this to be useful
until after N release.

Bug: 25858670
Change-Id: I599a5df4aef659769a6323402efe078d0d12d2ed
2016-01-13 12:49:23 +00:00
Clara Bayarri
a1771110d6 Create Work Challenge per-user condition
Change the current static condition to a per-user condition so we
can check and enable/disable the work challenge properly. Also add
an isAllowed API, as the Work Challenge can only be used when the
user's DPC targets N or above to maintain backwards compatibility.

Change-Id: I0cb8b475838816801868ffb24726407aa257b4de
2016-01-13 10:27:12 +00:00
Keisuke Kuroyanagi
2d12690d70 Merge "TextView: Offer suggestions in context menu." 2016-01-13 08:02:00 +00:00
Raph Levien
e53e428a7e resolve merge conflicts of 957bdc56c5 to master.
Change-Id: I4c8749f92a1fa39bf0d08e10155d9e68c87401c0
2016-01-12 17:45:34 -08:00
Wale Ogunwale
96eb366db9 Merge "Fixed some activity visiblility issues in picture-in-picutre mode" 2016-01-13 00:59:34 +00:00
Raph Levien
c08d43c4d7 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev am: 36c5ab3542 am: 50c22adc25
am: 243efe13a4

* commit '243efe13a44faf3617e2df409fa8f4bd30078a5d':
  Fix measurement to respect grapheme and span boundaries
2016-01-13 00:54:58 +00:00
Thierry Strudel
c1a1823cb8 Merge changes I96415ec6,I5d3aa7f9,I6294915e,I361928c0
* changes:
  Report SwapPss in dumpsys meminfo when requested and available
  Report SwapPss in am_pss reports
  Add Swap and SwapPss to meminfo checkin dump.
  Report SwapPss usage if available as part of Pss
2016-01-13 00:33:13 +00:00
Samuel Tan
3caecaec60 Merge "Remove PersistableBundle.aidl from Java framework"
am: 2e37bfd2d2

* commit '2e37bfd2d2f629ca50ecf0e6674484cd30560d26':
  Remove PersistableBundle.aidl from Java framework
2016-01-12 23:17:50 +00:00
Samuel Tan
239951a91e Remove PersistableBundle.aidl from Java framework
Remove PersistableBundle.aidl from the Java framework, since it
has been moved to the native libbinder.

BUG: 26292234
Change-Id: Ia3dc49a3ad92f4c579e6dff0606c1db8fb3be76b
TEST: aosp_arm builds successfully.
2016-01-12 14:43:32 -08:00