OSDN Git Service
Miao Wang [Thu, 30 Apr 2015 21:46:54 +0000 (21:46 +0000)]
am
c1000a39: am
8724d359: Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
* commit '
c1000a39655246170987dced51a85e94328d035f':
[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params.
Miao Wang [Thu, 30 Apr 2015 21:46:49 +0000 (21:46 +0000)]
am
7d581218: am
01060a33: Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
* commit '
7d5812183ac08daf844918619bcc1a5a1448aa42':
[RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Miao Wang [Thu, 30 Apr 2015 21:34:40 +0000 (21:34 +0000)]
am
8724d359: Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
* commit '
8724d359bfe1f95fd4c558b55069e1624b461f28':
[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params.
Miao Wang [Thu, 30 Apr 2015 21:34:36 +0000 (21:34 +0000)]
am
01060a33: Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
* commit '
01060a33a446a496cafcb06487c60df25775a1b9':
[RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Miao Wang [Thu, 30 Apr 2015 21:25:18 +0000 (21:25 +0000)]
Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
Miao Wang [Thu, 30 Apr 2015 21:25:01 +0000 (21:25 +0000)]
Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 21:21:01 +0000 (21:21 +0000)]
am
87706358: am
ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
* commit '
877063589ac8b5d9e8151df9b8553ddd3adb752b':
LayoutInflater should always try to generate LayoutParams for include
Alex Klyubin [Thu, 30 Apr 2015 21:20:56 +0000 (21:20 +0000)]
am
c8b068ce: am
cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
* commit '
c8b068ce477b3520a1ab20b7f29455d630724c38':
Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
John Reck [Thu, 30 Apr 2015 21:20:51 +0000 (21:20 +0000)]
am
1d8aae3b: am
db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
* commit '
1d8aae3b1924b2340250bdffe491819a26eea5fe':
Change how Java Bitmaps are accessed in a few places
Alex Klyubin [Thu, 30 Apr 2015 21:20:47 +0000 (21:20 +0000)]
am
07a2ebd3: am
0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev
* commit '
07a2ebd39d4c77c2dbd3c6e2bddecf76894f9fba':
Fix thread affinity of FingerprintManager.
Todd Kennedy [Thu, 30 Apr 2015 21:10:06 +0000 (21:10 +0000)]
am
c7e9a17a: am
10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev
* commit '
c7e9a17a626cc07eb9e4cb4b897dad50d3fb68a8':
Remove dependency upon FragmentActivity
Alan Viverette [Thu, 30 Apr 2015 21:09:51 +0000 (21:09 +0000)]
am
ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
* commit '
ac7927a89519a79ab73723a13ed9ea12ca16056f':
LayoutInflater should always try to generate LayoutParams for include
Alex Klyubin [Thu, 30 Apr 2015 21:09:46 +0000 (21:09 +0000)]
am
cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
* commit '
cf2999aacf45506ff6f9c2876bfd4fd5a99fc394':
Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
John Reck [Thu, 30 Apr 2015 21:09:41 +0000 (21:09 +0000)]
am
db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
* commit '
db672b03a2de26127b40dbe50c794b5697b01c37':
Change how Java Bitmaps are accessed in a few places
Alex Klyubin [Thu, 30 Apr 2015 21:09:36 +0000 (21:09 +0000)]
am
0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev
* commit '
0069301d364a219bbd4b166ba6f4d9be854d556f':
Fix thread affinity of FingerprintManager.
Alan Viverette [Thu, 30 Apr 2015 21:03:22 +0000 (21:03 +0000)]
Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 21:00:59 +0000 (21:00 +0000)]
Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
John Reck [Thu, 30 Apr 2015 21:00:07 +0000 (21:00 +0000)]
Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 20:57:44 +0000 (13:57 -0700)]
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
Alex Klyubin [Thu, 30 Apr 2015 20:56:17 +0000 (20:56 +0000)]
Merge "Fix thread affinity of FingerprintManager." into mnc-dev
Glenn Kasten [Thu, 30 Apr 2015 20:53:46 +0000 (20:53 +0000)]
am
f7de1bc8: am
2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev
* commit '
f7de1bc8f11aeb133bc916f020c6c6bb5eb859bf':
Clarifying which receiver method to call.
Todd Kennedy [Thu, 30 Apr 2015 20:51:21 +0000 (20:51 +0000)]
am
10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev
* commit '
10a54a7989a03eb0fdee7641c5795ac85b57e0dc':
Remove dependency upon FragmentActivity
Miao Wang [Thu, 30 Apr 2015 20:44:49 +0000 (13:44 -0700)]
[RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.
Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe
Alex Klyubin [Thu, 30 Apr 2015 20:42:06 +0000 (20:42 +0000)]
am
35e87811: am
033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev
* commit '
35e87811cb116535aec816bc3dbe17965e4328bf':
Switch from FingerprintService to FingerprintManager.
Alex Klyubin [Thu, 30 Apr 2015 20:42:01 +0000 (20:42 +0000)]
am
91725e78: am
3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev
* commit '
91725e78647dde14c915e28d96d6c929d1a09b9d':
Cleanup logic for per-op auth keys.
Glenn Kasten [Thu, 30 Apr 2015 20:39:21 +0000 (20:39 +0000)]
am
2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev
* commit '
2757fed2d612b7d7331e8ad9067df24b154ff8d7':
Clarifying which receiver method to call.
Todd Kennedy [Thu, 30 Apr 2015 20:38:48 +0000 (20:38 +0000)]
Merge "Remove dependency upon FragmentActivity" into mnc-dev
Miao Wang [Thu, 30 Apr 2015 17:47:42 +0000 (10:47 -0700)]
[RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Change-Id: Id86d5fe8475060a22f49b06b6e1f8f3eae7c7e9f
Mady Mellor [Thu, 30 Apr 2015 20:36:06 +0000 (20:36 +0000)]
am
d73f05f5: am
2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev
* commit '
d73f05f5f0ec3a212e4390d790c0229892c21930':
Add onStylusButtonPress listener to View
Alex Klyubin [Thu, 30 Apr 2015 20:30:48 +0000 (13:30 -0700)]
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
Glenn Kasten [Thu, 30 Apr 2015 20:27:59 +0000 (20:27 +0000)]
Merge "Clarifying which receiver method to call." into mnc-dev
Dan Stoza [Thu, 30 Apr 2015 20:07:22 +0000 (20:07 +0000)]
am
adcb47a5: Merge "Adjust display inversion matrix to account for luminance"
* commit '
adcb47a58571e1aa6ac829bf229409aef996942a':
Adjust display inversion matrix to account for luminance
Alex Klyubin [Thu, 30 Apr 2015 19:59:17 +0000 (19:59 +0000)]
am
033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev
* commit '
033dc46bb949a9a5e42ed51bbff1e055a7c58ca2':
Switch from FingerprintService to FingerprintManager.
Alex Klyubin [Thu, 30 Apr 2015 19:59:13 +0000 (19:59 +0000)]
am
3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev
* commit '
3cd8ec3c6832ee142e217e2653cce58de3f1dba1':
Cleanup logic for per-op auth keys.
Todd Kennedy [Wed, 15 Apr 2015 01:22:54 +0000 (18:22 -0700)]
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
John Reck [Fri, 10 Apr 2015 20:52:57 +0000 (13:52 -0700)]
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
Alex Klyubin [Thu, 30 Apr 2015 19:45:54 +0000 (19:45 +0000)]
Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 19:44:13 +0000 (19:44 +0000)]
Merge "Cleanup logic for per-op auth keys." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 18:43:53 +0000 (11:43 -0700)]
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
Peter Brinkmann [Thu, 30 Apr 2015 18:46:07 +0000 (14:46 -0400)]
Clarifying which receiver method to call.
Change-Id: Iaf89e1ff27e257fd25c54e189e8fcd1b10e8edfc
Dan Stoza [Thu, 30 Apr 2015 19:36:24 +0000 (19:36 +0000)]
Merge "Adjust display inversion matrix to account for luminance"
Alan Viverette [Thu, 30 Apr 2015 19:33:54 +0000 (12:33 -0700)]
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
Mady Mellor [Thu, 30 Apr 2015 19:23:12 +0000 (19:23 +0000)]
am
2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev
* commit '
2619ef3918e15bf415fb038e942cfbd98bff4c6a':
Add onStylusButtonPress listener to View
Yorke Lee [Thu, 30 Apr 2015 19:13:00 +0000 (19:13 +0000)]
am
e6a8bf80: am
08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
* commit '
e6a8bf80089ddea5cca01389df7fd827c5db7af2':
Add default dialer checks to Telecom/Telephony
Mady Mellor [Thu, 30 Apr 2015 19:06:44 +0000 (19:06 +0000)]
Merge "Add onStylusButtonPress listener to View" into mnc-dev
Yorke Lee [Thu, 30 Apr 2015 18:58:54 +0000 (18:58 +0000)]
am
08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
* commit '
08b51bfe8532ab7eff38ad69ad46c251be5c2792':
Add default dialer checks to Telecom/Telephony
John Spurlock [Thu, 30 Apr 2015 18:58:37 +0000 (18:58 +0000)]
am
e08e3940: am
24ea865f: Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev
* commit '
e08e39402c6d896dffeb48ddb3ac8254addc8384':
Volume l10n: Increase charlimits on zen submode strings.
Svetoslav [Thu, 30 Apr 2015 18:58:31 +0000 (18:58 +0000)]
am
f44f6b0d: am
e4762675: Merge "Fix the build" into mnc-dev
* commit '
f44f6b0d6d49b4ddde0d5b9152e7c1b9ba626b54':
Fix the build
Yorke Lee [Thu, 30 Apr 2015 18:49:57 +0000 (18:49 +0000)]
Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
John Spurlock [Thu, 30 Apr 2015 18:40:20 +0000 (18:40 +0000)]
am
24ea865f: Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev
* commit '
24ea865f0fd3b1ceafb3786bbed20ea345bc5cc0':
Volume l10n: Increase charlimits on zen submode strings.
Svetoslav [Thu, 30 Apr 2015 18:40:16 +0000 (18:40 +0000)]
am
e4762675: Merge "Fix the build" into mnc-dev
* commit '
e4762675023bd2be20992c7bccce7e555a249e93':
Fix the build
Alex Klyubin [Thu, 30 Apr 2015 18:39:44 +0000 (18:39 +0000)]
am
f22b6732: am
4223ce7d: Merge "Track Keymaster changes." into mnc-dev
* commit '
f22b67323724fc5cd96f549817547b2936dfc7d6':
Track Keymaster changes.
Eino-Ville Talvala [Thu, 30 Apr 2015 18:39:38 +0000 (18:39 +0000)]
am
6dee203a: am
6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev
* commit '
6dee203aee673eea91633d8557a4aa1ff21296cb':
Camera2: LEGACY: Support prepare(), sort of.
Svetoslav [Thu, 30 Apr 2015 18:39:32 +0000 (18:39 +0000)]
am
0165cf4d: am
3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev
* commit '
0165cf4d719ab6560507a18ffd7375b0ad850622':
Add use fingerprint app op - framework
John Spurlock [Thu, 30 Apr 2015 18:31:58 +0000 (18:31 +0000)]
Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:31:35 +0000 (18:31 +0000)]
Merge "Fix the build" into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:30:33 +0000 (11:30 -0700)]
Fix the build
Change-Id: I24e697e989b5f88c3f5e61343fbff60a09aa4c12
Svetoslav [Thu, 30 Apr 2015 18:29:58 +0000 (18:29 +0000)]
am
9e4003cd: am
729d0a06: Merge "Add process outgoing calls app op - framework" into mnc-dev
* commit '
9e4003cde7dc33342042328923999ec545a8bfbf':
Add process outgoing calls app op - framework
Svetoslav [Thu, 30 Apr 2015 18:29:49 +0000 (18:29 +0000)]
am
71264fb2: am
c27b3fca: Merge "Add SIP app op - framework." into mnc-dev
* commit '
71264fb236b50de815a328d9ecab29535d1ecb17':
Add SIP app op - framework.
Andreas Gampe [Thu, 30 Apr 2015 18:29:35 +0000 (18:29 +0000)]
am
5eedef96: am
fcda22b1: Merge "am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp" into mnc-dev
* commit '
5eedef96d9408cdb78b5a28878bf1013cc11f8d3':
am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp
John Spurlock [Thu, 30 Apr 2015 18:29:33 +0000 (14:29 -0400)]
Volume l10n: Increase charlimits on zen submode strings.
Bug:
20713756
Change-Id: Ib8f65997bfbd2c5a042bc02ff13ef9d5c8f90ecb
Alex Klyubin [Thu, 30 Apr 2015 18:24:31 +0000 (18:24 +0000)]
am
4223ce7d: Merge "Track Keymaster changes." into mnc-dev
* commit '
4223ce7dc8b1f0544a7d273831b674b6be1e5c4f':
Track Keymaster changes.
Eino-Ville Talvala [Thu, 30 Apr 2015 18:24:25 +0000 (18:24 +0000)]
am
6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev
* commit '
6faa3acaad130533a4d597938fc15b04988a02b2':
Camera2: LEGACY: Support prepare(), sort of.
Svetoslav [Thu, 30 Apr 2015 18:24:20 +0000 (18:24 +0000)]
am
3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev
* commit '
3327f3d6886a96ad70f4e96e4b7c26b9555429b6':
Add use fingerprint app op - framework
Alex Klyubin [Thu, 30 Apr 2015 18:15:23 +0000 (18:15 +0000)]
Merge "Track Keymaster changes." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 17:50:45 +0000 (10:50 -0700)]
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
Eino-Ville Talvala [Thu, 30 Apr 2015 18:10:29 +0000 (18:10 +0000)]
Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:06:01 +0000 (18:06 +0000)]
am
729d0a06: Merge "Add process outgoing calls app op - framework" into mnc-dev
* commit '
729d0a06eaaa40f5be4d9dc5bd580f525ba8360e':
Add process outgoing calls app op - framework
Svetoslav [Thu, 30 Apr 2015 18:05:57 +0000 (18:05 +0000)]
am
c27b3fca: Merge "Add SIP app op - framework." into mnc-dev
* commit '
c27b3fca8258c3d7c27b42b4f6978d91f09dcb52':
Add SIP app op - framework.
Andreas Gampe [Thu, 30 Apr 2015 18:05:53 +0000 (18:05 +0000)]
am
fcda22b1: Merge "am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp" into mnc-dev
* commit '
fcda22b1fe33370922a53d6562aa15366818bd45':
am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp
Svetoslav [Thu, 30 Apr 2015 18:05:17 +0000 (18:05 +0000)]
Merge "Add use fingerprint app op - framework" into mnc-dev
Robin Lee [Thu, 30 Apr 2015 18:05:13 +0000 (18:05 +0000)]
am
644ff2f9: am
ef25597a: SystemUI strings: prospective VPN strings for apps
* commit '
644ff2f9d0dac0c34786578c0d0b79729a5c2664':
SystemUI strings: prospective VPN strings for apps
Svetoslav [Thu, 30 Apr 2015 18:02:54 +0000 (18:02 +0000)]
Merge "Add process outgoing calls app op - framework" into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:01:50 +0000 (18:01 +0000)]
Merge "Add SIP app op - framework." into mnc-dev
Andreas Gampe [Thu, 30 Apr 2015 17:53:48 +0000 (17:53 +0000)]
Merge "am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp" into mnc-dev
Robin Lee [Thu, 30 Apr 2015 17:51:12 +0000 (17:51 +0000)]
am
ef25597a: SystemUI strings: prospective VPN strings for apps
* commit '
ef25597acfb15b1f4f501fbdcbafd1b6fa8cc9c6':
SystemUI strings: prospective VPN strings for apps
Robin Lee [Wed, 29 Apr 2015 16:15:49 +0000 (17:15 +0100)]
SystemUI strings: prospective VPN strings for apps
Bug:
20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
(cherry picked from commit
63539bd5fac53d90adff35df340562a1926d610e)
Jean-Michel Trivi [Thu, 30 Apr 2015 17:14:30 +0000 (17:14 +0000)]
am
3d42d238: am
f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev
* commit '
3d42d2380f5af53ce299610e27f40a8d88930c89':
AudioService receives callback for dynamic policy mix state changes
Alex Klyubin [Thu, 30 Apr 2015 17:13:39 +0000 (10:13 -0700)]
Cleanup logic for per-op auth keys.
This streamlines the exception throwing logic for per-op auth keys of
AndroidKeyStore.
Change-Id: I7e27c17fd89d5a7f71f5d7578f584189c5236fb8
Mady Mellor [Thu, 30 Apr 2015 16:58:35 +0000 (09:58 -0700)]
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
Jean-Michel Trivi [Thu, 30 Apr 2015 16:57:03 +0000 (16:57 +0000)]
am
f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev
* commit '
f764d219f0faf82219600761c8d0562623b8f054':
AudioService receives callback for dynamic policy mix state changes
Jean-Michel Trivi [Thu, 30 Apr 2015 16:43:17 +0000 (16:43 +0000)]
Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev
Chris Craik [Thu, 30 Apr 2015 16:39:15 +0000 (16:39 +0000)]
am
75c4e3e4: am
ed375f26: Merge "Fix rendernode flag logging" into mnc-dev
* commit '
75c4e3e4d58f310174bbc24e6b2fb058773f8f31':
Fix rendernode flag logging
Alex Klyubin [Thu, 30 Apr 2015 16:39:11 +0000 (16:39 +0000)]
am
84c64efe: am
403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
* commit '
84c64efef90818888dca12f7650a632b70438a8f':
AndroidKeyStore keys should not be handled by Bouncy Castle.
Chris Craik [Thu, 30 Apr 2015 16:25:39 +0000 (16:25 +0000)]
am
ed375f26: Merge "Fix rendernode flag logging" into mnc-dev
* commit '
ed375f269bab6fb9f0dc224defae8099b2b1a7f7':
Fix rendernode flag logging
Alex Klyubin [Thu, 30 Apr 2015 16:25:33 +0000 (16:25 +0000)]
am
403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
* commit '
403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc':
AndroidKeyStore keys should not be handled by Bouncy Castle.
Alan Viverette [Thu, 30 Apr 2015 16:21:57 +0000 (16:21 +0000)]
am
19b9f8ef: am
8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev
* commit '
19b9f8ef3eaf392db0a993ae0d5a7a84e9d6c60f':
ActionBar SearchView's default hint shouldn't override SearchableInfo
Chris Craik [Thu, 30 Apr 2015 16:19:32 +0000 (16:19 +0000)]
Merge "Fix rendernode flag logging" into mnc-dev
John Spurlock [Thu, 30 Apr 2015 16:16:13 +0000 (16:16 +0000)]
am
1642e354: am
8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '
1642e354ed10bc606f403ac6f529392f3f25dd2d':
Zen: New event condition data model.
Ronghua Wu [Thu, 30 Apr 2015 16:16:08 +0000 (16:16 +0000)]
am
c98070a4: am
1b12db9e: Merge "media: set codec exception reason." into mnc-dev
* commit '
c98070a46168c14e54899bfca69889154e3a565d':
media: set codec exception reason.
Abodunrinwa Toki [Thu, 30 Apr 2015 16:15:45 +0000 (16:15 +0000)]
am
d0363bc3: am
5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev
* commit '
d0363bc3948894cc79f32719e04d66496572fe31':
Use theme attributes for FloatingToolbar colors.
Narayan Kamath [Thu, 30 Apr 2015 16:15:38 +0000 (16:15 +0000)]
am
cf9f16d2: am
144b0bb6: Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev
* commit '
cf9f16d2b0900fdf9125f12f9c6c086123e7657d':
Fix incorrect javadoc for Uri.getQueryParameter.
Chris Craik [Thu, 30 Apr 2015 16:12:39 +0000 (09:12 -0700)]
Fix rendernode flag logging
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
Alex Klyubin [Thu, 30 Apr 2015 16:12:32 +0000 (16:12 +0000)]
Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 16:07:36 +0000 (16:07 +0000)]
am
8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev
* commit '
8310f87d96791e8b864df5e821fe65273c2dd874':
ActionBar SearchView's default hint shouldn't override SearchableInfo
Alan Viverette [Thu, 30 Apr 2015 15:59:20 +0000 (15:59 +0000)]
Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev
John Spurlock [Thu, 30 Apr 2015 15:58:27 +0000 (15:58 +0000)]
am
8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '
8f72b4037022c4f860caafa296e2ac309bde177f':
Zen: New event condition data model.
Ronghua Wu [Thu, 30 Apr 2015 15:58:22 +0000 (15:58 +0000)]
am
1b12db9e: Merge "media: set codec exception reason." into mnc-dev
* commit '
1b12db9e6225171da87ed9586daeabf76b53c05a':
media: set codec exception reason.
John Spurlock [Thu, 30 Apr 2015 15:45:53 +0000 (15:45 +0000)]
Merge "Zen: New event condition data model." into mnc-dev
John Spurlock [Thu, 30 Apr 2015 13:30:52 +0000 (09:30 -0400)]
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