186562 Commits

Author SHA1 Message Date
Yang Ni
249e6c8cd8 am 02dff422: am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation."
* commit '02dff422a7734764e3ce00179f62ba115f2081a5':
  Fix value size data type in closure creation.
2015-04-01 02:19:41 +00:00
Yang Ni
02dff422a7 am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation."
* commit '5db6f1fafa4990b2d583dcb407be361edc02019d':
  Fix value size data type in closure creation.
2015-04-01 02:05:27 +00:00
Andy Hung
c09ccc5631 Merge "Fix SoundPool track recycling for fast tracks" 2015-04-01 01:42:00 +00:00
Craig Mautner
e1d6333341 Merge "Add lockTaskOnLaunch attribute." 2015-04-01 01:40:57 +00:00
Yang Ni
5db6f1fafa am 63dde9c8: Merge "Fix value size data type in closure creation."
* commit '63dde9c88d780fc16a4f2471e405b4f5dc35823c':
  Fix value size data type in closure creation.
2015-04-01 01:27:27 +00:00
Craig Mautner
0fb1cb56ab Add lockTaskOnLaunch attribute.
The new AndroidManifest activity attribute, lockTaskOnLaunch attribute
is a boolean that puts the system in lockTask mode when true and if
the activity specified is the root of a privileged task.

This bug also fixes lockTask mode for root activities that finish
themselves. Previously finish was not allowed even if there were
activities left in the task that were still valid.

A NullPointerException for lock task toasts has also been fixed.

Fixes bug 19995702.

Change-Id: Iba6976b1a0cc5a22eb526db66d2e9af66445541f
2015-03-31 18:15:05 -07:00
Qiwen Zhao
9a1ada6df6 Merge "Data usage API: any uid is accessible to system apps running in any user" 2015-04-01 00:40:05 +00:00
Santos Cordon
bb251057fb Merge "Do not hide any call log entries when they are added." 2015-04-01 00:01:16 +00:00
Svet Ganov
36a9ba67fc Merge "Fix clobbered shared user install permissions." 2015-03-31 23:59:10 +00:00
Santos Cordon
14c2ebc2a6 Do not hide any call log entries when they are added.
When a call log entry is added, and it's phone account does not match a
currently registered one, we set it to hidden.  This code was built for
the calllog restore case where call log entries would be hidden when
added if the original phone account wasn't also
present on the new device (where the restore is being performed).

We no longer do that so we're removing the code that sets any call log
entry to hidden.

-- Resubmitting since this change was lost to a merge conflict --

Change-Id: I1ef094d5a35063e8f89cd1ecb1e5a0b59361781c
2015-03-31 16:58:57 -07:00
Svet Ganov
37f05184b5 Fix clobbered shared user install permissions.
The install permissions for a shared user were clobbered when a pending
package for this user was matched to the shared user after reading the
state from XML. The reason was that the copy code in PackageSettingBase was
using the getter to get its settings state to which to copy the permissions
for the pending package but this is the permissions state for the shared
user instead of the package. Since the pending package has no permissions
we ended up clobbering the permissions for the shared user.

bug:19955926

Change-Id: Ia8d090883d50fc987a32ceeed6c7562c49698328
2015-03-31 16:52:49 -07:00
Alex Klyubin
92c9692ed5 am d684ebd3: am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
* commit 'd684ebd3a62cb026048d9eebacddb0f824113a5e':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.
2015-03-31 23:01:15 +00:00
Kenny Root
34702d2e7e am 28c51bac: (-s ours) am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '28c51bacbde1a2a497e20fa4f299fa653eaac9a3':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
2015-03-31 23:00:58 +00:00
Craig Mautner
db3ff2221f Merge "Clear the previous states before setting the new app visibility" 2015-03-31 22:54:27 +00:00
Fyodor Kupolov
654875fad0 Merge "Support for nested bundles in setApplicationRestrictions" 2015-03-31 22:52:18 +00:00
tiger_huang
a9da39e86d Clear the previous states before setting the new app visibility
If setAppVisibility() is called multiple times in a short interval
while the screen is turned off between the calls, the visibility of
the app would be wrong. For example, the user may see the app under
the launcher, not the wallpaper under the launcher.

The flow to the issue:
1. Screen is on.
2. AM calls setAppVisibility() token=App A's token, visible=true
3. Screen is turned off.
4. AM calls setAppVisibility() token=App A's token, visible=false

Note:
a. In 2., WM would put App A into mOpeningApps, and tell it to be
   visible.
b. In 4., because the screen is off now, App A would not be removed
   from mOpeningApps. App A might be told to be invisible directly
   through setTokenVisibilityLocked(), but it would be told to be
   visible again in handleAppTransitionReadyLocked() later.

Change-Id: Icf3d69031ea2822245008248ec8f12bd57218880
2015-03-31 15:52:15 -07:00
Ruben Brunk
095d999045 Merge "Add CameraService to system server." 2015-03-31 22:27:53 +00:00
Yang Ni
4470d68a89 Unhide new ScriptGroup API
This includes the new class ScriptGroup2 and a related change in
class Script to add InvokeID.

Change-Id: I012dc0a32c65803453022fa534ef05f855ea5ace
2015-03-31 15:00:13 -07:00
Yang Ni
63dde9c88d Merge "Fix value size data type in closure creation." 2015-03-31 21:32:24 +00:00
Alex Klyubin
d684ebd3a6 am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
* commit '0bd10c21ff1bb00f178738301ad4663c7cebd28f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.
2015-03-31 21:20:51 +00:00
Alex Klyubin
0bd10c21ff am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
* commit '5960c3d56614830439718e93968e0c7d2727262f':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.
2015-03-31 21:13:49 +00:00
Alex Klyubin
5960c3d566 Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." 2015-03-31 21:00:17 +00:00
Alex Klyubin
b406f24291 Add unauthenticated AES ciphers backed by AndroidKeyStore.
This adds the following AES transformations:
* AES/ECB/NoPadding
* AES/ECB/PKCS7Padding
* AES/CBC/NoPadding
* AES/CBC/PKCS7Padding
* AES/CTR/NoPadding

Bug: 18088752
Change-Id: I3e4702e59868f8f2225c31b1c159d20008b9999d
2015-03-31 13:59:07 -07:00
Miao Wang
eb9a10c829 Merge "[RenderScript] Remove @hide for setAutoPadding(boolean)." 2015-03-31 19:41:02 +00:00
John Reck
e478f460fe Merge "Fix warn log format" 2015-03-31 19:24:47 +00:00
Kenny Root
28c51bacbd am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit 'a3a52a96543bd3874e23d90f91b5f4197eab98e5':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
2015-03-31 19:22:17 +00:00
Kenny Root
a3a52a9654 am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '4999b175e9c25b7e860f9c2f3b6566d08c8e50e7':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
2015-03-31 19:14:48 +00:00
Kenny Root
4999b175e9 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 19:10:50 +00:00
John Reck
98fa0a322e Fix warn log format
Change-Id: I7876dd5d0d0f68dde4cb0768699d800daff754f1
2015-03-31 12:03:51 -07:00
Adrian Roos
1e3e6e99c6 Merge "Fix WindowOrientationListener crash if no sensor present" 2015-03-31 19:02:09 +00:00
Ruben Brunk
9d21ee5d77 Add CameraService to system server.
- Adds a camera service to system server that forwards events to the
  mediaserver camera service.
- Notify the camera service when the device user changes.

Bug: 19186859
Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
2015-03-31 12:01:22 -07:00
Stuart Scott
edd33c8bdf Merge "Move reset network settings into framework." 2015-03-31 18:57:58 +00:00
Simranjit Singh Kohli
3580cd0b52 Merge "[Auth:Last Credentials Timing] : Introducing API" 2015-03-31 18:32:51 +00:00
Yin-Chia Yeh
37ec99b19c Merge "Add RAW12 image format" 2015-03-31 18:27:23 +00:00
Adrian Roos
1274196374 Fix WindowOrientationListener crash if no sensor present
Bug: 19999145
Change-Id: Ie0c2a2f9ff337a6538e85dc9bd0ef108dd468d28
2015-03-31 11:20:30 -07:00
Chad Brubaker
7744a25673 am 543189eb: am 826d6357: am 5491ea9e: Merge "Include operation handle in OperationResult"
* commit '543189eb711c7aeefab9566b74b62c34d35115f5':
  Include operation handle in OperationResult
2015-03-31 18:16:31 +00:00
Chad Brubaker
543189eb71 am 826d6357: am 5491ea9e: Merge "Include operation handle in OperationResult"
* commit '826d63572be4b23ad2f70f3004d520d54ef4dc01':
  Include operation handle in OperationResult
2015-03-31 18:10:02 +00:00
Chad Brubaker
826d63572b am 5491ea9e: Merge "Include operation handle in OperationResult"
* commit '5491ea9e5bc6ce8eb0dc2e91e46608f6aa3e7dfc':
  Include operation handle in OperationResult
2015-03-31 18:03:21 +00:00
Raph Levien
b929d65800 Merge "Remove unused constants in android_text_StaticLayout.cpp" 2015-03-31 17:49:31 +00:00
Chad Brubaker
5491ea9e5b Merge "Include operation handle in OperationResult" 2015-03-31 17:49:16 +00:00
Raph Levien
ee101a3c66 Remove unused constants in android_text_StaticLayout.cpp
The logic for computing line breaking moved to Minikin, and so the
various Unicode characters with special meaning for line breaks are no
longer used in android_text_StaticLayout.cpp (which is now a fairly
thin wrapper that just does JNI glue). This patch deletes the
constants, which makes the warnings-as-errors setting of our current
clang build happy.

Change-Id: I1bb3596ca4f0c78a8e185af9000c0c366fb9b020
2015-03-31 10:42:05 -07:00
Wale Ogunwale
1252317bdc Merge "Fix not persisting activities with FLAG_ACTIVITY_RETAIN_IN_RECENTS." 2015-03-31 17:20:16 +00:00
Christopher Tate
9e521fa9d1 Merge "Fixes to full-backup scheduling edge cases" 2015-03-31 17:19:39 +00:00
Mady Mellor
d032091fec Merge "Recognizes the stylus scale gesture in ScaleGestureDetector" 2015-03-31 17:11:44 +00:00
Zoltan Szatmary-Ban
9aa7258a17 Data usage API: any uid is accessible to system apps running in any user
This CL mostly affects Settings app as it can run in a user different
than UserHandle.OWNER. Since it is a system app it should have access
to all uid's data usage, regardless of which user it is currently running
in.

Bug: 19967498
Change-Id: I4a7787134d998457f7e2a1029183d44d9584083e
2015-03-31 18:09:20 +01:00
Svetoslav
4d42782e8c am becacfb8: (-s ours) am ffd24a58: am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
* commit 'becacfb843f162896600c818bfd753089caef70a':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
2015-03-31 17:04:31 +00:00
Kenny Root
fbf4f81179 am 6a2d2b9f: (-s ours) am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '6a2d2b9f2b8b3fab6eafe37626a02b0a2f52747f':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
2015-03-31 17:04:26 +00:00
Svetoslav
becacfb843 am ffd24a58: am 13d8e41d: am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
* commit 'ffd24a58c89bcb502e8d6299b4368353b08a45be':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
2015-03-31 16:54:36 +00:00
Kenny Root
6a2d2b9f2b am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '5fdb2ea76a8e0ffe8786a1e92ce565f7380384db':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
2015-03-31 16:54:32 +00:00
Wale Ogunwale
29382d2961 resolved conflicts for merge of 6abcec1d to master
Change-Id: I28986f8863298a767a8290b02d5418d4d1d42d17
2015-03-31 09:53:39 -07:00