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

190782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
John Spurlock
7ea13e85b3 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.
 2015-04-30 18:58:37 +00:00
Eino-Ville Talvala
16434a8bf4 am 6b2ccdc2: am 6dee203a: am 6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev 
* commit '6b2ccdc26b6866ef36bd3fd9c7d311200dbcb755':
  Camera2: LEGACY: Support prepare(), sort of.
 2015-04-30 18:58:37 +00:00
Svetoslav
2d8d1f4389 am f44f6b0d: am e4762675: Merge "Fix the build" into mnc-dev 
* commit 'f44f6b0d6d49b4ddde0d5b9152e7c1b9ba626b54':
  Fix the build
 2015-04-30 18:58:31 +00:00
Svetoslav
e80045ac64 am cae8686c: am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev 
* commit 'cae8686c8853de745baf8a26406d18efab09a380':
  Add use fingerprint app op - framework
 2015-04-30 18:58:30 +00:00
Peter Brinkmann
ffe0498abb Merge "Clarifying which receiver method to call." 2015-04-30 18:58:29 +00:00
Yorke Lee
08b51bfe85 Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev 2015-04-30 18:49:58 +00:00
Peter Brinkmann
0abae734f0 Clarifying which receiver method to call. 
Change-Id: Iaf89e1ff27e257fd25c54e189e8fcd1b10e8edfc
 2015-04-30 14:46:07 -04:00
John Spurlock
e08e39402c am 24ea865f: Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev 
* commit '24ea865f0fd3b1ceafb3786bbed20ea345bc5cc0':
  Volume l10n: Increase charlimits on zen submode strings.
 2015-04-30 18:40:20 +00:00
Svetoslav
f44f6b0d6d am e4762675: Merge "Fix the build" into mnc-dev 
* commit 'e4762675023bd2be20992c7bccce7e555a249e93':
  Fix the build
 2015-04-30 18:40:16 +00:00
Alex Klyubin
ca4ff2ac1a am f22b6732: am 4223ce7d: Merge "Track Keymaster changes." into mnc-dev 
* commit 'f22b67323724fc5cd96f549817547b2936dfc7d6':
  Track Keymaster changes.
 2015-04-30 18:39:44 +00:00
Eino-Ville Talvala
6b2ccdc26b am 6dee203a: am 6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev 
* commit '6dee203aee673eea91633d8557a4aa1ff21296cb':
  Camera2: LEGACY: Support prepare(), sort of.
 2015-04-30 18:39:38 +00:00
Svetoslav
0c3eedd1dc am bc4affc9: am 9e4003cd: am 729d0a06: Merge "Add process outgoing calls app op - framework" into mnc-dev 
* commit 'bc4affc982c508da58c934d5d30f393dfd701a9a':
  Add process outgoing calls app op - framework
 2015-04-30 18:39:35 +00:00
Svetoslav
cae8686c88 am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev 
* commit '0165cf4d719ab6560507a18ffd7375b0ad850622':
  Add use fingerprint app op - framework
 2015-04-30 18:39:32 +00:00
Svetoslav
5887ddb6f3 am ccd36808: am 71264fb2: am c27b3fca: Merge "Add SIP app op - framework." into mnc-dev 
* commit 'ccd368087ee0fa0478f5cbec0af2ac6b48a2cc6e':
  Add SIP app op - framework.
 2015-04-30 18:39:30 +00:00
Andreas Gampe
6bc6b52c9a am d3e8ddfe: am 5eedef96: am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 
* commit 'd3e8ddfe0145939078532db055c5f866d40aaa71':
  am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
 2015-04-30 18:39:25 +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
Svetoslav
bc4affc982 am 9e4003cd: am 729d0a06: Merge "Add process outgoing calls app op - framework" into mnc-dev 
* commit '9e4003cde7dc33342042328923999ec545a8bfbf':
  Add process outgoing calls app op - framework
 2015-04-30 18:29:58 +00:00
Svetoslav
ccd368087e am 71264fb2: am c27b3fca: Merge "Add SIP app op - framework." into mnc-dev 
* commit '71264fb236b50de815a328d9ecab29535d1ecb17':
  Add SIP app op - framework.
 2015-04-30 18:29:49 +00:00