37626 Commits

Author SHA1 Message Date
Alan Viverette
1970f57071 Don't use TypedArray after recycling it
BUG: 13771701
Change-Id: Ib3ccb270f44cd236ce5294f8d0e01f1922005a3b
2014-04-02 16:46:31 -07:00
Alan Viverette
b325345ef0 Merge "Switch framework Holo references to Quantum.Light" 2014-04-02 22:15:16 +00:00
Dave Platt
db89fe2a2b Merge "Document and enforce "one request per Listener" rule" 2014-04-02 21:09:43 +00:00
Kenny Guy
f4824a0688 Fix issue with not allowing activities for current user.
Change-Id: Ic2e30c3f4990a03aac9801ee9bf5f270a5e90ef8
2014-04-02 19:17:41 +01:00
John Reck
a8b937115a Merge "Revert "Force-enable hardware acceleration for apps"" 2014-04-02 18:03:49 +00:00
John Reck
dd58e797aa Revert "Force-enable hardware acceleration for apps"
This reverts commit 2a0901107443685ef2f2a55d0b62ddcc6cf183ba.

Change-Id: I47c58b7251411432bd6a3eeb6fe567385b1c084f
2014-04-02 16:54:28 +00:00
Kenny Guy
1ccace916c Merge "Rename related users to profiles." 2014-04-02 13:06:28 +00:00
Kenny Guy
2a764949c9 Rename related users to profiles.
Rename the related user concept as profiles.
When returning profiles of a user include the
user as a profile of itself.

Change-Id: Id5d4f29017b7ca6844632ce643f10331ad733e1d
2014-04-02 13:44:50 +01:00
Narayan Kamath
b69bb44558 resolved conflicts for merge of 71ab4f4f to master
Change-Id: I888c231f7579523e12fbd68f820f0775019e51e0
2014-04-02 11:52:07 +01:00
Narayan Kamath
71ab4f4f48 am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
  Move zygote startup logic to the frameworks.
2014-04-02 10:41:24 +00:00
Narayan Kamath
973b4663b0 Move zygote startup logic to the frameworks.
The Zygote class is now in com.android.internal.os. It is
responsible for the vast majority of work before and after
the call to fork(). It calls back into the Runtime via
the new dalvik.system.ZygoteHooks class to allow the Runtime
to perform pre fork cleanup and post fork initialization.

The native code in Zygote.cpp is a direct and straightforward
port of the existing code in art. Most differences are
superficial, for example :
- We use C style logging (ALOGE) instead of stream based
  logging.
- We call env->FatalError() instead of using LOG(FATAL)

Change-Id: Ia101fb2af12d23894fe57e4134d2bc6d142e5059
2014-04-02 10:18:43 +01:00
Christopher Tate
a2dbe4e3cd Merge "Rejigger the invalid-key checks at backup time" 2014-04-01 23:45:24 +00:00
Christopher Tate
cba5941c60 Rejigger the invalid-key checks at backup time
Bug 13732002

Change-Id: Ic8f71234d1bbc7420eaa8e1762b999d09f308d46
2014-04-01 16:43:00 -07:00
Alan Viverette
6259933ec9 Switch framework Holo references to Quantum.Light
Change-Id: Ib545a143f1959b6104adbc9d594dd626851d90b3
2014-04-01 14:57:39 -07:00
John Reck
4126693be3 Merge "Disable RenderThread" 2014-04-01 21:51:40 +00:00
John Reck
9afe775ca9 Disable RenderThread
Now that there's a half dozen bugs to fix, switch back
 to the stable renderer until the issues are addressed

Change-Id: I1513cf26717e8ab6b1a038e86ae9a40f5f1a3c50
2014-04-01 14:49:21 -07:00
Fabrice Di Meglio
724a4f7aea Merge "Update SearchIndexables contract for allowing summary ON and OFF indexing" 2014-04-01 21:17:03 +00:00
Paul McLean
6f127c9b6c Merge "Initial implementation of USB Audio output." 2014-04-01 16:15:47 +00:00
Paul Lawrence
df42723d6b Merge "Don't double prompt on booting encrypted device" 2014-04-01 15:07:10 +00:00
Fabrice Di Meglio
98274a9714 Update SearchIndexables contract for allowing summary ON and OFF indexing
- add summary ON and OFF indexing (for CheckBoxPreference)

Change-Id: I634cae653748d29e58fa2e696372efff08ce17d2
2014-03-31 19:45:04 -07:00
Katie McCormick
4c9f457141 am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
* commit 'fb19fc61f28bcff1b129d1a60913f5b8722f10cf':
  Doc Update: revert PendingIntent fix.
2014-04-01 01:25:41 +00:00
Fabrice Di Meglio
a780d9323b Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)." 2014-04-01 01:21:32 +00:00
Zhijun He
1a9b646c6b Camera2: Fix missing capture result callback issue
When configuring output right after submitting some capture request, the
waitUntilIdle clears the capture mCaptureListenerMap and
mRepeatingRequestIdDeletedList. This caused the listener is cleared before
the capture result is delivered to application side. Since the listener is
already removed properly, it is really not needed to clear them right after
idling the device.

It also doesn't make sense to add the repeating request id that has no
listener hooked up to the mRepeatingRequestIdDeletedList, this caused
out of sync between id deleted list and the mCaptureListenerMap for
repeating request.

Bug: 13730119
Change-Id: I94ab7a5515f841ffd97b103c2c1b71d92afd955a
2014-03-31 17:34:29 -07:00
Katie McCormick
fb19fc61f2 am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
  Doc Update: revert PendingIntent fix.
2014-04-01 00:21:34 +00:00
Katie McCormick
905a5b1477 am 87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
  Doc Update: revert PendingIntent fix.
2014-04-01 00:15:52 +00:00
Fabrice Di Meglio
1cf3594114 Fix bug #13727850 Input values are not visible when setting up the lockscreen...
...security(PIN/Passwor/Pattern).

- remove that hardcoded color
- enable passing a color for the Path lines

Change-Id: Ie40b15bf209f41ea2df16842a3e56ffc2020df65
2014-03-31 16:50:29 -07:00
Paul McLean
3af0fe0c9d Initial implementation of USB Audio output.
Change-Id: I7fbbe421285d628fa49591c6469ac50efec77ccf
2014-03-31 16:41:33 -07:00
Katie McCormick
87d9d1a040 Doc Update: revert PendingIntent fix.
Original fix was in error. Reverting. See:

b/10641568

Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
2014-03-31 16:18:15 -07:00
Zhihai Xu
6b96c1b2ea am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
* commit '7d394df2ab8f951215a775df8d2bd9e6518e746a':
  LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:35:38 +00:00
Zhihai Xu
7d394df2ab am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
  LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:28:47 +00:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Dave Platt
e7369bd4df Document and enforce "one request per Listener" rule
The API and implementation of NsdManager imply that a separate
Listener is to be used for each active registration or discovery
request.  This isn't formally documented or properly enforced, and
weird and unpredictable things happen if an application uses a
Listener for more than one request at a time.

Update documentation to make this an explicit requirement.

Enforce the restriction when a new request is submitted for
processing; if the Listener is already being used to track an active
request, throw an exception.

Document the fact that apps should unregister services and cancel
service discoveries when the app is stopped (in KitKat and prior
releases, they'll leak if this isn't done.)

Re-order "release the Listener" operation to occur before the Listener
callback, so that the Listener can be reused by the application once
the callback has been entered - this eliminates a race condition.
Document this.

Pass 2: typos, added documentation about API level, changed to using
an explicitly defined return value for "busy listener".

Bug: 13512512
Change-Id: Ic164110759204b27d8a14376777b593ebe1865fa
2014-03-31 13:43:45 -07:00
ztenghui
2f9ec3560d Merge "Make the reveal animation API public" 2014-03-31 20:08:12 +00:00
Brian Carlstrom
ed99dc89c3 am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit '7156b7c65d6f158c4898a93f8e2cea0bf94791d1':
  Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 20:06:06 +00:00
Brian Carlstrom
7156b7c65d am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit 'b11952d6f6851dbd1da447da967f6e07984942fe':
  Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 19:59:31 +00:00
Adrian Roos
53ab5174d5 Merge "Define trust agent framework components" 2014-03-31 19:21:05 +00:00
Adrian Roos
82142c21dd Define trust agent framework components
Adds the TrustManager system service that allows
registering for changes to the trust status and
reporting events that are important to trust agents.

Bug: 13723878
Change-Id: I7d0d2ea86fd755702d31aa5d49cac038a6cd4301
2014-03-31 21:18:28 +02:00
Alan Viverette
883e04b3c9 Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed" 2014-03-31 19:12:45 +00:00
Adrian Roos
716f20d833 Merge "Define initial trust agent API" 2014-03-31 19:11:36 +00:00
John Reck
b4a132a05f Merge "Turn on RenderThread" 2014-03-31 19:09:13 +00:00
Adrian Roos
ff2144ccb4 Define initial trust agent API
Adds the minimal API needed to define a useful trust agent.

Bug: 13723878
Change-Id: Ib24440bab7b16d0b656bde8b059e7d42cab2c7dc
2014-03-31 20:40:49 +02:00
Brian Carlstrom
ff9ca781d0 Improve detail message for X509TrustManagerExtensions argument validation
Bug: 13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
2014-03-31 11:22:34 -07:00
John Reck
8e150fef2b Merge "Add invokeFunctor" 2014-03-31 18:04:06 +00:00
ztenghui
be23fa2f73 Make the reveal animation API public
Change-Id: Iafb17bc768b33b320ffa731a9474be05382126e6
2014-03-31 10:41:31 -07:00
John Reck
0f61cde234 Turn on RenderThread
Change-Id: I50fd607420baa438eb16b99b1de8604037c11a88
2014-03-31 10:19:14 -07:00
John Reck
0d1f634f4b Add invokeFunctor
Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
2014-03-28 20:57:32 -07:00
Wei Wang
ab4fc115e9 am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
  Callback on correct method when status is unsuccessful.
2014-03-29 02:03:03 +00:00
Wei Wang
1b09c97d8a am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.
2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful.
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00