190197 Commits

Author SHA1 Message Date
Alan Viverette
5181f279c8 Fix layoutlib build breakage
Change-Id: Id3a9b79ac47ef27b04a96ff3ee50688bbb58f9c0
2015-04-30 15:57:42 -07:00
Rich Slogar
7dc7d09ba5 am a1c7176b: am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates
* commit 'a1c7176bdcc810000f782460dd02d99fda5e0250':
2015-04-30 21:37:11 +00:00
Rich Slogar
8febd74eaf am 7fbde8f5: am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '7fbde8f508cf5148f395280753c99b63cc525e45':
2015-04-30 21:37:07 +00:00
Rich Slogar
9c6e60500d am ac9c751d: am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit 'ac9c751d74135994ddaa9ccc14e87809efc08693':
2015-04-30 21:37:02 +00:00
Rich Slogar
50c29a3e09 am 994d6ffe: am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '994d6ffec75b50ff199760f4c3cf464b2d0f0e83':
2015-04-30 21:36:58 +00:00
Rich Slogar
24863faa05 Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev 2015-04-30 21:27:45 +00:00
Miao Wang
8724d359bf Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev 2015-04-30 21:25:25 +00:00
Miao Wang
01060a33a4 Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev 2015-04-30 21:25:03 +00:00
Rich Slogar
0820394f7e resolved conflicts for merge of edf44562 to mnc-dev
Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
2015-04-30 14:20:12 -07:00
Alan Viverette
ac7927a895 Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 2015-04-30 21:03:23 +00:00
Alex Klyubin
cf2999aacf Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 2015-04-30 21:01:00 +00:00
John Reck
db672b03a2 Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 2015-04-30 21:00:08 +00:00
Alex Klyubin
6358b881f2 Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
This converts KM_ERROR_CALLER_NONCE_PROHIBITED into
InvalidAlgorithmParameterSpec, as expected by the contract of JCA
Cipher.

Bug: 18088752
Change-Id: I6a01e2d7118c478b27a0d7a5a14a127de8913755
2015-04-30 13:57:44 -07:00
Alex Klyubin
0069301d36 Merge "Fix thread affinity of FingerprintManager." into mnc-dev 2015-04-30 20:56:24 +00:00
Miao Wang
82585b3906 [RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.

Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe
2015-04-30 13:44:49 -07:00
Todd Kennedy
10a54a7989 Merge "Remove dependency upon FragmentActivity" into mnc-dev 2015-04-30 20:38:49 +00:00
Miao Wang
1e940d87c4 [RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Change-Id: Id86d5fe8475060a22f49b06b6e1f8f3eae7c7e9f
2015-04-30 13:37:38 -07:00
Alex Klyubin
24e9e966a8 Fix thread affinity of FingerprintManager.
FingerprintManager internally creates a Handler which needs to be
bound to a Looper thread. Prior to this CL the Handler was bound to
the Looper of the current thread. This caused issues:
* Different instances of FingerprintManager could be bound to
  different Looper threads.
* Callbacks from FingerprintManager were invoked on arbitrary
  threads (or not at all if the Looper was there but wasn't running).
* FingerprintManager couldn't be obtained by apps on most non-main
  threads leading to java.lang.RuntimeException: Can't create handler
  inside thread that has not called Looper.prepare().

This CL fixes the issue by binding the FingerprintManager's Handler to
the Looper running on the main thread.

Bug: 20725228
Change-Id: I4a0382d6e11df9f23b8db9f0deec77369af31b5e
2015-04-30 13:34:58 -07:00
Glenn Kasten
2757fed2d6 Merge "Clarifying which receiver method to call." into mnc-dev 2015-04-30 20:28:00 +00:00
Todd Kennedy
a5fc6f006f Remove dependency upon FragmentActivity
The FragmentManagerImpl is intimately tied with a FragmentActivity. In
many cases, we want to be able to create / manage Fragments outside of
a FragmentManager. This defines a FragmentController interface that can
be used by any class to host Fragments.

Bug: 19569654
Change-Id: I6816a5c1815122d206062b9f4584ad460b3d41dd
2015-04-30 12:52:32 -07:00
John Reck
ed207b9274 Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-30 12:46:57 -07:00
Alex Klyubin
033dc46bb9 Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev 2015-04-30 19:45:55 +00:00
Alex Klyubin
3cd8ec3c68 Merge "Cleanup logic for per-op auth keys." into mnc-dev 2015-04-30 19:44:15 +00:00
Alex Klyubin
2d7a85cd2b Switch from FingerprintService to FingerprintManager.
FingerprintService is a lower layer of abstraction which should
ideally be accessed only via FingerprintManager from
AndroidKeyStore.

The main issue with the switch is that it requires a reference to a
Context. This is now obtained using ActivityThread's hidden API.

Change-Id: If921e169838ee2cc5c7690b8c8d8ea95c33248aa
2015-04-30 12:43:05 -07:00
Peter Brinkmann
d8f6363a5d Clarifying which receiver method to call.
Change-Id: Iaf89e1ff27e257fd25c54e189e8fcd1b10e8edfc
2015-04-30 12:43:02 -07:00
Alan Viverette
84aa2fb65a LayoutInflater should always try to generate LayoutParams for include
A recent optimization assumed that layout_width and layout_height always
had to be defined to successfully generate layout params, but this is not
guaranteed to be true for custom ViewGroups.

Bug: 20267738
Change-Id: If09d346f30c0848b984b9137088f8f3b7617cd08
2015-04-30 12:33:54 -07:00
Mady Mellor
2619ef3918 Merge "Add onStylusButtonPress listener to View" into mnc-dev 2015-04-30 19:06:45 +00:00
Yorke Lee
08b51bfe85 Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev 2015-04-30 18:49:58 +00:00
John Spurlock
24ea865f0f Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev 2015-04-30 18:31:59 +00:00
Svetoslav
e476267502 Merge "Fix the build" into mnc-dev 2015-04-30 18:31:37 +00:00
Svetoslav
2dac95d033 Fix the build
Change-Id: I24e697e989b5f88c3f5e61343fbff60a09aa4c12
2015-04-30 11:30:33 -07:00
John Spurlock
f6ed7249cf Volume l10n: Increase charlimits on zen submode strings.
Bug: 20713756
Change-Id: Ib8f65997bfbd2c5a042bc02ff13ef9d5c8f90ecb
2015-04-30 14:29:33 -04:00
Alex Klyubin
4223ce7dc8 Merge "Track Keymaster changes." into mnc-dev 2015-04-30 18:15:24 +00:00
Alex Klyubin
7ea5090264 Track Keymaster changes.
* MAC length is now specified as a parameters to the begin operation
  instead of as a parameter at key generation/import time.
* KM_TAG_MAC_LENGTH is now in bits instead of in bytes.

Change-Id: I752fe232d11d3ac39a575a48948215d84ded8fb9
2015-04-30 11:11:50 -07:00
Eino-Ville Talvala
6faa3acaad Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev 2015-04-30 18:10:31 +00:00
Svetoslav
3327f3d688 Merge "Add use fingerprint app op - framework" into mnc-dev 2015-04-30 18:05:18 +00:00
Svetoslav
729d0a06ea Merge "Add process outgoing calls app op - framework" into mnc-dev 2015-04-30 18:02:55 +00:00
Svetoslav
c27b3fca82 Merge "Add SIP app op - framework." into mnc-dev 2015-04-30 18:01:51 +00:00
Andreas Gampe
fcda22b1fe Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 2015-04-30 17:53:51 +00:00
Robin Lee
ef25597acf SystemUI strings: prospective VPN strings for apps
Bug: 20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
(cherry picked from commit 63539bd5fac53d90adff35df340562a1926d610e)
2015-04-30 17:38:29 +00:00
Alex Klyubin
8c82b4508f Cleanup logic for per-op auth keys.
This streamlines the exception throwing logic for per-op auth keys of
AndroidKeyStore.

Change-Id: I7e27c17fd89d5a7f71f5d7578f584189c5236fb8
2015-04-30 10:13:39 -07:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
2015-04-30 09:58:35 -07:00
Jean-Michel Trivi
f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 2015-04-30 16:43:19 +00:00
Chris Craik
ed375f269b Merge "Fix rendernode flag logging" into mnc-dev 2015-04-30 16:19:33 +00:00
Chris Craik
031e69ff81 Fix rendernode flag logging
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
2015-04-30 09:12:44 -07:00
Alex Klyubin
403ac2d64f Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 2015-04-30 16:12:33 +00:00
Alan Viverette
8310f87d96 Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev 2015-04-30 15:59:21 +00:00
John Spurlock
8f72b40370 Merge "Zen: New event condition data model." into mnc-dev 2015-04-30 15:45:55 +00:00
John Spurlock
d60258f2d3 Zen: New event condition data model.
- Add system condition provider for calendar event-based rules.
 - Add stub condition provider for handling event conditions.
 - Add various shared items to support new settings subpage.

Bug: 20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
2015-04-30 11:42:11 -04:00
Ronghua Wu
1b12db9e62 Merge "media: set codec exception reason." into mnc-dev 2015-04-30 15:40:36 +00:00