drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,802 Commits 1 Branch 0 Tags
Commit Graph

190802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
0219269280 am c89e1a96: am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 
* commit 'c89e1a96c5e4cc16928341f30a45e315d1a4abb6':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
 2015-05-01 01:32:53 +00:00
John Reck
6dc2c89b49 am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 
* commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7':
  Change how Java Bitmaps are accessed in a few places
 2015-05-01 01:32:46 +00:00
Alex Klyubin
ab5ed9d2b6 am c9122d6f: am 07a2ebd3: am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev 
* commit 'c9122d6fe29411eb02e91c7713a450aba94b65e3':
  Fix thread affinity of FingerprintManager.
 2015-05-01 01:32:41 +00:00
Todd Kennedy
6b379c8a34 am 9c14b3ab: am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev 
* commit '9c14b3ab0d6e42031d0465114a979b644c6890d2':
  Remove dependency upon FragmentActivity
 2015-05-01 01:32:25 +00:00
Glenn Kasten
7a03833756 am cc2f85a4: am f7de1bc8: am 2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev 
* commit 'cc2f85a406fac0b18e44006c62fbd5aa603cbbe1':
  Clarifying which receiver method to call.
 2015-05-01 01:32:06 +00:00
Alex Klyubin
753ac84591 am 9b6b6656: am 35e87811: am 033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev 
* commit '9b6b6656b8848a2347996fab7f802b49edc8147f':
  Switch from FingerprintService to FingerprintManager.
 2015-05-01 01:31:56 +00:00
Alex Klyubin
3dbeb7e5ea am dac77549: am 91725e78: am 3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev 
* commit 'dac775492fa78baaaed64501dfd25a2eaefe275e':
  Cleanup logic for per-op auth keys.
 2015-05-01 01:31:51 +00:00
Mady Mellor
304169fdd0 Merge "resolved conflicts for merge of 04f2fe39 to master" 2015-05-01 01:28:46 +00:00
Mady Mellor
d274400205 resolved conflicts for merge of 04f2fe39 to master 
Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce
 2015-04-30 16:17:16 -07:00
Zheng Fu
096a75eb77 Merge "Add constants for ContactMetadataProvider." 2015-04-30 21:23:13 +00:00
Alex Klyubin
c89e1a96c5 am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 
* commit 'c8b068ce477b3520a1ab20b7f29455d630724c38':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
 2015-04-30 21:20:56 +00:00
John Reck
0385dc8d12 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
 2015-04-30 21:20:51 +00:00
Alex Klyubin
c9122d6fe2 am 07a2ebd3: am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev 
* commit '07a2ebd39d4c77c2dbd3c6e2bddecf76894f9fba':
  Fix thread affinity of FingerprintManager.
 2015-04-30 21:20:47 +00:00
Todd Kennedy
9c14b3ab0d am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev 
* commit 'c7e9a17a626cc07eb9e4cb4b897dad50d3fb68a8':
  Remove dependency upon FragmentActivity
 2015-04-30 21:10:06 +00:00
Alex Klyubin
c8b068ce47 am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 
* commit 'cf2999aacf45506ff6f9c2876bfd4fd5a99fc394':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
 2015-04-30 21:09:46 +00:00
John Reck
1d8aae3b19 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
 2015-04-30 21:09:41 +00:00
Alex Klyubin
07a2ebd39d am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev 
* commit '0069301d364a219bbd4b166ba6f4d9be854d556f':
  Fix thread affinity of FingerprintManager.
 2015-04-30 21:09:36 +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
Glenn Kasten
cc2f85a406 am f7de1bc8: am 2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev 
* commit 'f7de1bc8f11aeb133bc916f020c6c6bb5eb859bf':
  Clarifying which receiver method to call.
 2015-04-30 20:53:46 +00:00
Todd Kennedy
c7e9a17a62 am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev 
* commit '10a54a7989a03eb0fdee7641c5795ac85b57e0dc':
  Remove dependency upon FragmentActivity
 2015-04-30 20:51:21 +00:00
Alex Klyubin
9b6b6656b8 am 35e87811: am 033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev 
* commit '35e87811cb116535aec816bc3dbe17965e4328bf':
  Switch from FingerprintService to FingerprintManager.
 2015-04-30 20:42:06 +00:00
Alex Klyubin
dac775492f am 91725e78: am 3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev 
* commit '91725e78647dde14c915e28d96d6c929d1a09b9d':
  Cleanup logic for per-op auth keys.
 2015-04-30 20:42:01 +00:00
Glenn Kasten
f7de1bc8f1 am 2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev 
* commit '2757fed2d612b7d7331e8ad9067df24b154ff8d7':
  Clarifying which receiver method to call.
 2015-04-30 20:39:21 +00:00
Todd Kennedy
10a54a7989 Merge "Remove dependency upon FragmentActivity" into mnc-dev 2015-04-30 20:38:49 +00:00
Mady Mellor
04f2fe3958 am d73f05f5: am 2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev 
* commit 'd73f05f5f0ec3a212e4390d790c0229892c21930':
  Add onStylusButtonPress listener to View
 2015-04-30 20:36:06 +00: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
Dan Stoza
52cf4f960b am 4f32365f: am adcb47a5: Merge "Adjust display inversion matrix to account for luminance" 
* commit '4f32365fe7723e12fa6aee99ea002daf299b5f2c':
  Adjust display inversion matrix to account for luminance
 2015-04-30 20:21:38 +00:00
Dan Stoza
4f32365fe7 am adcb47a5: Merge "Adjust display inversion matrix to account for luminance" 
* commit 'adcb47a58571e1aa6ac829bf229409aef996942a':
  Adjust display inversion matrix to account for luminance
 2015-04-30 20:07:22 +00:00
Alex Klyubin
35e87811cb am 033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev 
* commit '033dc46bb949a9a5e42ed51bbff1e055a7c58ca2':
  Switch from FingerprintService to FingerprintManager.
 2015-04-30 19:59:17 +00:00
Alex Klyubin
91725e7864 am 3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev 
* commit '3cd8ec3c6832ee142e217e2653cce58de3f1dba1':
  Cleanup logic for per-op auth keys.
 2015-04-30 19:59:13 +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
Dan Stoza
adcb47a585 Merge "Adjust display inversion matrix to account for luminance" 2015-04-30 19:36:27 +00:00
Yorke Lee
1fec804059 am 89319a95: am e6a8bf80: am 08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev 
* commit '89319a9562d2b205a6b004a04e132b0219f92f9c':
  Add default dialer checks to Telecom/Telephony
 2015-04-30 19:26:17 +00:00
Mady Mellor
d73f05f5f0 am 2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev 
* commit '2619ef3918e15bf415fb038e942cfbd98bff4c6a':
  Add onStylusButtonPress listener to View
 2015-04-30 19:23:12 +00:00
John Spurlock
1694c4ed65 am 7ea13e85: am e08e3940: am 24ea865f: Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev 
* commit '7ea13e85b3e6b40992a919c40f6cf52569124679':
  Volume l10n: Increase charlimits on zen submode strings.
 2015-04-30 19:13:14 +00:00
Svetoslav
f156c95331 am 2d8d1f43: am f44f6b0d: am e4762675: Merge "Fix the build" into mnc-dev 
* commit '2d8d1f438919bccc52401afa0c3cd7b5f91e2252':
  Fix the build
 2015-04-30 19:13:06 +00:00
Yorke Lee
89319a9562 am e6a8bf80: am 08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev 
* commit 'e6a8bf80089ddea5cca01389df7fd827c5db7af2':
  Add default dialer checks to Telecom/Telephony
 2015-04-30 19:13:00 +00:00
Mady Mellor
2619ef3918 Merge "Add onStylusButtonPress listener to View" into mnc-dev 2015-04-30 19:06:45 +00:00
Alex Klyubin
9fcab496e7 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-04-30 18:59:03 +00:00
Yorke Lee
e6a8bf8008 am 08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev 
* commit '08b51bfe8532ab7eff38ad69ad46c251be5c2792':
  Add default dialer checks to Telecom/Telephony
 2015-04-30 18:58:54 +00:00
Alex Klyubin
86f7f1810f am ca4ff2ac: am f22b6732: am 4223ce7d: Merge "Track Keymaster changes." into mnc-dev 
* commit 'ca4ff2ac1af0d8c0651b3bbc22adb0418105e134':
  Track Keymaster changes.
 2015-04-30 18:58:42 +00:00