Alan Viverette
bbabf55b85
am 1970f570: Don\'t use TypedArray after recycling it
...
* commit '1970f570714a4746bf592e26731ea0ee8933d363':
Don't use TypedArray after recycling it
2014-04-02 23:53:45 +00:00
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
01cefbc5b3
am b325345e: Merge "Switch framework Holo references to Quantum.Light"
...
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
2014-04-02 22:23:17 +00:00
Alan Viverette
b325345ef0
Merge "Switch framework Holo references to Quantum.Light"
2014-04-02 22:15:16 +00:00
Dave Platt
9d50674496
am db89fe2a: Merge "Document and enforce "one request per Listener" rule"
...
* commit 'db89fe2a2b7932f013f7a2dd136324c3daeee253':
Document and enforce "one request per Listener" rule
2014-04-02 21:17:13 +00:00
Dave Platt
db89fe2a2b
Merge "Document and enforce "one request per Listener" rule"
2014-04-02 21:09:43 +00:00
John Reck
9eba8f98ba
am a8b93711: Merge "Revert "Force-enable hardware acceleration for apps""
...
* commit 'a8b937115ac3bf047c8fc6c750f052fd633c5dd8':
Revert "Force-enable hardware acceleration for apps"
2014-04-02 18:09:06 +00: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 2a09011074 .
Change-Id: I47c58b7251411432bd6a3eeb6fe567385b1c084f
2014-04-02 16:54:28 +00:00
Kenny Guy
11b169e23c
am 1ccace91: Merge "Rename related users to profiles."
...
* commit '1ccace916c8fdc61f1a8db6677aed518d31647e6':
Rename related users to profiles.
2014-04-02 13:12:02 +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
f67783a474
am b69bb445: resolved conflicts for merge of 71ab4f4f to master
...
* commit 'b69bb445585a083b8e4ff8a13a1a1a63e9c22a6a':
Move zygote startup logic to the frameworks.
2014-04-02 11:05:03 +00: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
5d531210a2
am a2dbe4e3: Merge "Rejigger the invalid-key checks at backup time"
...
* commit 'a2dbe4e3cd3d9d52cda3e798bf9405ff8a780250':
Rejigger the invalid-key checks at backup time
2014-04-01 23:51:00 +00: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
John Reck
707692ca09
am 4126693b: Merge "Disable RenderThread"
...
* commit '4126693be37244116d23e9c6dce2a15b88ad988f':
Disable RenderThread
2014-04-01 21:58:13 +00: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
7d097781f4
am 724a4f7a: Merge "Update SearchIndexables contract for allowing summary ON and OFF indexing"
...
* commit '724a4f7aea3723034d66e45cec538da7ff26fb93':
Update SearchIndexables contract for allowing summary ON and OFF indexing
2014-04-01 21:24:30 +00: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
4da27ea877
am 6f127c9b: Merge "Initial implementation of USB Audio output."
...
* commit '6f127c9b6c249ca1cd17c07a8476edd0fcc1f04d':
Initial implementation of USB Audio output.
2014-04-01 16:17:28 +00:00
Paul McLean
6f127c9b6c
Merge "Initial implementation of USB Audio output."
2014-04-01 16:15:47 +00:00
Paul Lawrence
da7ff92c48
am df42723d: Merge "Don\'t double prompt on booting encrypted device"
...
* commit 'df42723d6b717fd2882c98c930a0f93c75af2474':
Don't double prompt on booting encrypted device
2014-04-01 15:11:31 +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
175b5ce863
am 4c9f4571: am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
...
* commit '4c9f457141747b19f2f78f682889313bcbd010e6':
Doc Update: revert PendingIntent fix.
2014-04-01 01:32:57 +00: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
Zhijun He
e926095130
am 1a9b646c: Camera2: Fix missing capture result callback issue
...
* commit '1a9b646c6b83aa091164dc94f9d1348bfca38227':
Camera2: Fix missing capture result callback issue
2014-04-01 01:01:21 +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
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
b024bcd7b7
am 6b96c1b2: am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
...
* commit '6b96c1b2ea5d28fc2501226bda14327f1963ba0c':
LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:41:04 +00: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
008492f291
am 2f9ec356: Merge "Make the reveal animation API public"
...
* commit '2f9ec3560d21e3db4f91a64e68d6b678714cd749':
Make the reveal animation API public
2014-03-31 20:11:00 +00:00
Brian Carlstrom
91f24e795b
am ed99dc89: am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
...
* commit 'ed99dc89c32830cffe7a3912b2026942910c4c8f':
Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 20:10:57 +00: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
3830700257
am 53ab5174: Merge "Define trust agent framework components"
...
* commit '53ab5174d5009786dc58da3011181b77e325c130':
Define trust agent framework components
2014-03-31 19:25:58 +00:00
Adrian Roos
53ab5174d5
Merge "Define trust agent framework components"
2014-03-31 19:21:05 +00:00