Ecosyste.ms: OpenCollective

An open API service for software projects hosted on Open Collective.

github.com/PitchBlackRecoveryProject/android_system_security


https://github.com/PitchBlackRecoveryProject/android_system_security

Fix pessimizing move.

Using std::move here prevents the compiler from performing copy
elision.

Change-Id: I21ad9dfec4...

17ee05c5842d8730f4a0b81b14638ce6ac2287ac authored over 9 years ago
am c2120744: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." into mnc-dr-dev

* commit 'c2120744da8d0612ad54484b314f94e1e6e3a167':
Wrap incomplete keymaster1 implementation...

a481160fa6b335850cbda8e9903de4972ad8541b authored over 9 years ago
Merge "Wrap incomplete keymaster1 implementations with sw keymaster." into mnc-dr-dev

c2120744da8d0612ad54484b314f94e1e6e3a167 authored over 9 years ago
am cbfdeefe: am 8a2c33b6: (-s ours) am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit 'cbfdeefef7a12fcb383e8b0f840771f6983927aa':
Properly check for Blob max length

1ffa74c16534e49641130ebc1daf65a8833b839f authored over 9 years ago
am 8f25c6d8: am cbfdeefe: am 8a2c33b6: (-s ours) am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit '8f25c6d86ea0e2eebe543ccef86e665046d190dd':
Properly check for Blob max length

8991d029afc7a97c45ce4eaae8fd6ada2462dc62 authored over 9 years ago
am cbfdeefe: am 8a2c33b6: (-s ours) am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit 'cbfdeefef7a12fcb383e8b0f840771f6983927aa':
Properly check for Blob max length

8f25c6d86ea0e2eebe543ccef86e665046d190dd authored over 9 years ago
am 8a2c33b6: (-s ours) am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit '8a2c33b6f9b28e18a2a59d1fa0e11cf553a51eac':
Properly check for Blob max length

cbfdeefef7a12fcb383e8b0f840771f6983927aa authored over 9 years ago
am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit '48d998cd4982554f9b66b029331dab17154299cc':
Properly check for Blob max length

8a2c33b6f9b28e18a2a59d1fa0e11cf553a51eac authored over 9 years ago
am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit 'aca711395dd65d05b48c8bec3b1d2da8d81d41b8':
Properly check for Blob max length

48d998cd4982554f9b66b029331dab17154299cc authored over 9 years ago
am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit '738d1e9d0ec29964f01211ceb6f471d6666b2316':
Properly check for Blob max length

aca711395dd65d05b48c8bec3b1d2da8d81d41b8 authored over 9 years ago
am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit '1b8885baf5ebe2e2e6fdfe6e53174fd79f46ae11':
Properly check for Blob max length

738d1e9d0ec29964f01211ceb6f471d6666b2316 authored over 9 years ago
am 0d593526: Properly check for Blob max length

* commit '0d5935262dbbcaf2cf6145529ffd71a728ef4609':
Properly check for Blob max length

1b8885baf5ebe2e2e6fdfe6e53174fd79f46ae11 authored over 9 years ago
am a8f5bbbe: am 54b1e9ad: Properly check for Blob max length

* commit 'a8f5bbbee318cf3dc0272a80a59eb6c0d537c692':
Properly check for Blob max length

7ec2cc505a1f32336ce8e8a5da29776e467681f2 authored over 9 years ago
am 54b1e9ad: Properly check for Blob max length

* commit '54b1e9ad01c8042a449a9237833a335d6be04e83':
Properly check for Blob max length

a8f5bbbee318cf3dc0272a80a59eb6c0d537c692 authored over 9 years ago
am 54b1e9ad: Properly check for Blob max length

* commit '54b1e9ad01c8042a449a9237833a335d6be04e83':
Properly check for Blob max length

b426dec943778717b106cb138d04f2fe6b68d426 authored over 9 years ago
Properly check for Blob max length

sizeof(mBlob.value) is incorrect because writeBlob pads up to the next
AES_BLOCK_SIZE

Bug:22802...

0d5935262dbbcaf2cf6145529ffd71a728ef4609 authored over 9 years ago
Properly check for Blob max length

sizeof(mBlob.value) is incorrect because writeBlob pads up to the next
AES_BLOCK_SIZE

Bug:22802...

54b1e9ad01c8042a449a9237833a335d6be04e83 authored over 9 years ago
Enable unsigned-integer-overflow sanitization

Change-Id: I589c52fb076fc5212c751914daedd455fb65f5e2

db25fcde6b0008083ebcc56ca58c30b396d19325 authored over 9 years ago
Wrap incomplete keymaster1 implementations with sw keymaster.

SoftKeymasteDevice can provide software digesting and padding for
keymaster1 implementations tha...

55268b5b037a8c3537602b1073ad624455d3672d authored over 9 years ago
am 4174f017: am c761a1ed: (-s ours) am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit '4174f017cc331c9c52d63dd999f81e3425d2cbb4':
Fix unchecked length in Blob creation

385de556b6a9854c2c7509905b962b21d8336481 authored over 9 years ago
am 4174f017: am c761a1ed: (-s ours) am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit '4174f017cc331c9c52d63dd999f81e3425d2cbb4':
Fix unchecked length in Blob creation

40ea49748b17b5fa052180e59db53041b2d37c29 authored over 9 years ago
am c761a1ed: (-s ours) am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit 'c761a1ed08d110348bdc897804f3ba59d746579f':
Fix unchecked length in Blob creation

4174f017cc331c9c52d63dd999f81e3425d2cbb4 authored over 9 years ago
am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit '63bc525c24efc3a1f6386a4e0e395a4c70a335ca':
Fix unchecked length in Blob creation

c761a1ed08d110348bdc897804f3ba59d746579f authored over 9 years ago
am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit '853b8d7984673976f943fc1664012598cb040696':
Fix unchecked length in Blob creation

63bc525c24efc3a1f6386a4e0e395a4c70a335ca authored over 9 years ago
am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit 'fd1ad3790fb089485cf7afc07f8b9f53d4c3136a':
Fix unchecked length in Blob creation

853b8d7984673976f943fc1664012598cb040696 authored over 9 years ago
am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit '1c73457afe3cb0afbc2a2884c41cfdd1148aca36':
Fix unchecked length in Blob creation

fd1ad3790fb089485cf7afc07f8b9f53d4c3136a authored over 9 years ago
am b124c9e8: Fix unchecked length in Blob creation

* commit 'b124c9e86a5f8466f527501c6677b4b1b165c0b1':
Fix unchecked length in Blob creation

1c73457afe3cb0afbc2a2884c41cfdd1148aca36 authored over 9 years ago
am 803f37f5: Fix unchecked length in Blob creation

* commit '803f37f5d1bf75cb6e0d007f7d473645efd19a1d':
Fix unchecked length in Blob creation

3f6dafd78763cc4604897a0eea53b021e1390a3a authored over 9 years ago
am 803f37f5: Fix unchecked length in Blob creation

* commit '803f37f5d1bf75cb6e0d007f7d473645efd19a1d':
Fix unchecked length in Blob creation

37fe0d075ef408e660ca19fd3860cfd16ca3dc78 authored over 9 years ago
Fix unchecked length in Blob creation

Applications can specify arbitrary blobs using insert(), check their
length to prevent overflow ...

b124c9e86a5f8466f527501c6677b4b1b165c0b1 authored over 9 years ago
Fix unchecked length in Blob creation

Applications can specify arbitrary blobs using insert(), check their
length to prevent overflow ...

803f37f5d1bf75cb6e0d007f7d473645efd19a1d authored over 9 years ago
am 2de8b758: Add all digests and padding modes to legacy keys

* commit '2de8b75821bd62c90dde78e2ca78bbddfaf7ab19':
Add all digests and padding modes to lega...

6ef569d553b39b92bcf2172bf032de10b24a021b authored over 9 years ago
am 2de8b758: Add all digests and padding modes to legacy keys

* commit '2de8b75821bd62c90dde78e2ca78bbddfaf7ab19':
Add all digests and padding modes to lega...

ddf0fd86241915a3c5f499013f1def00ed28ecd3 authored over 9 years ago
Add all digests and padding modes to legacy keys

Bug: 22556114
Change-Id: I44fda03305ddd50cb4ba3c6f6b24cfd9c2af9659

2de8b75821bd62c90dde78e2ca78bbddfaf7ab19 authored over 9 years ago
am a9a17eec: Mark 0 length files as corrupt

* commit 'a9a17eeca2f5d9d3101a7e0bb136360697b6e2f0':
Mark 0 length files as corrupt

6d02d1fc8106df04b31860d382df6a40cd0e0b8e authored over 9 years ago
am a9a17eec: Mark 0 length files as corrupt

* commit 'a9a17eeca2f5d9d3101a7e0bb136360697b6e2f0':
Mark 0 length files as corrupt

26020aa292f8388c3e8193572016e7562709a6ba authored over 9 years ago
Mark 0 length files as corrupt

Files created by keystore should never be 0 length however a vendor ran
into such a case when te...

a9a17eeca2f5d9d3101a7e0bb136360697b6e2f0 authored over 9 years ago
am 06114e6a: Fix erroneous reporting of all tokens as timed out.

* commit '06114e6a1e1663c39b718224c4f326d844b15b98':
Fix erroneous reporting of all tokens as ...

a56597ac3b225d7e4755ae3d7a12217087fb29f8 authored over 9 years ago
Fix erroneous reporting of all tokens as timed out.

Bug: 22205545
Change-Id: I170e798b327020ff741031ec05e875c685a49e9d

06114e6a1e1663c39b718224c4f326d844b15b98 authored over 9 years ago
am 5f042153: Merge "Rename keymaster tag types to clarify that integers are unsigned."

* commit '5f042153834d1514ae65316f77dc148cfce63fa7':
Rename keymaster tag types to clarify tha...

ef9ea72284d4a468babadba636fe24a6574ec672 authored over 9 years ago
Merge "Rename keymaster tag types to clarify that integers are unsigned."

5f042153834d1514ae65316f77dc148cfce63fa7 authored over 9 years ago
Rename keymaster tag types to clarify that integers are unsigned.

Bug: 22008538
Change-Id: Id6e3ca5c1defc8149b7ae7de5787b3635e2a4262

0696a53dede5667424e0262d14992a56265ff16c authored over 9 years ago
am 0ebf13db: Rename keymaster tag types to clarify that integers are unsigned.

* commit '0ebf13dbf975028735a8afc42e39c6ea47cec704':
Rename keymaster tag types to clarify tha...

36cc145bd7e05b14f923c4ebe2935ba7eef4dbc7 authored over 9 years ago
Rename keymaster tag types to clarify that integers are unsigned.

Bug: 22008538
Change-Id: Id6e3ca5c1defc8149b7ae7de5787b3635e2a4262

0ebf13dbf975028735a8afc42e39c6ea47cec704 authored over 9 years ago
am b913aa57: Merge "Abort operation pruning only if it fails to make space." into mnc-dev

* commit 'b913aa5774c96fae83afe3dd1935394f0edcaaa9':
Abort operation pruning only if it fails ...

c71e6f0d5b0bb1812f6ec88ccc04c842991661c4 authored over 9 years ago
am 4e88f9be: Don\'t ignore errors from begin operation.

* commit '4e88f9be2b3bb3dcea43f338532882681ee77352':
Don't ignore errors from begin operation.

a9d3b15747e125a6a3e97a4e9459cb7f5d6bd337 authored over 9 years ago
Merge "Abort operation pruning only if it fails to make space." into mnc-dev

b913aa5774c96fae83afe3dd1935394f0edcaaa9 authored over 9 years ago
Abort operation pruning only if it fails to make space.

keystore service's begin operation may sometimes encounter a situation
where the underlying devi...

700c1a35c52798831b8a8d76a042c4650c6d793f authored over 9 years ago
Don't ignore errors from begin operation.

This fixes a bug introduced by
9221bff2f13451ef330135bb32ea96de2a8b09cc which invoked authorizat...

4e88f9be2b3bb3dcea43f338532882681ee77352 authored over 9 years ago
am 53752414: Fully support uint64 key validity dates.

* commit '53752414eab95d31d76db4bb088ac1d5499b5aae':
Fully support uint64 key validity dates.

322307bd6ac98d676b55183c497c90c9955e4e3d authored over 9 years ago
Fully support uint64 key validity dates.

This fixes the issue where, on 32-bit platforms, keys expiring after
about 2^31 - 1 seconds sinc...

53752414eab95d31d76db4bb088ac1d5499b5aae authored over 9 years ago
am 9221bff2: Add keymaster authorization policy enforcement to keystore.

* commit '9221bff2f13451ef330135bb32ea96de2a8b09cc':
Add keymaster authorization policy enforc...

52facda4e803408b9820b297536972957ae56bc1 authored over 9 years ago
Add keymaster authorization policy enforcement to keystore.

Bug: 19511945
Change-Id: I76c04e8d3253ba490cedac53bbc75943ec68df1d

9221bff2f13451ef330135bb32ea96de2a8b09cc authored over 9 years ago
am 84c14f09: Merge "Remove exist check from doLegacySignVerify" into mnc-dev

* commit '84c14f0957b365fd33534b88b7eec97b287b67b9':
Remove exist check from doLegacySignVerify

5e0845e5dfa1fac32e480de4853988d6415d644e authored over 9 years ago
Merge "Remove exist check from doLegacySignVerify" into mnc-dev

84c14f0957b365fd33534b88b7eec97b287b67b9 authored over 9 years ago
Remove exist check from doLegacySignVerify

exist requires the keystore exist permission which callers of
sign/verify may not have. Instead ...

df70517b8d85b30e6ac7001ec68348f07d5129cb authored over 9 years ago
am b2ffa420: Don\'t check authorizations for pubkey operations.

* commit 'b2ffa420da26414379b31807eec76ec8c9f3b0a9':
Don't check authorizations for pubkey ope...

f2628279aac7f3b45a71e22675b9550dc6e09385 authored over 9 years ago
Don't check authorizations for pubkey operations.

Bug: 21877150
Change-Id: I43dafb66fc3246f4d8e3bf4743fbdcbe072468d1

b2ffa420da26414379b31807eec76ec8c9f3b0a9 authored over 9 years ago
am fd92fe14: Merge "Track keymaster method changes"

* commit 'fd92fe1463f5df1bbfc1a46d2790d940d998368c':
Track keymaster method changes

1be935bbac95d3f5f0fc924bd1605e345f4f45ef authored over 9 years ago
am 8521f7a4: Merge "Remove references to Google in Android keymaster."

* commit '8521f7a41c717a064960f7535b1665b96a8dbba4':
Remove references to Google in Android ke...

ff1ee6f045a76e19a71318c889db8a24ebeb76f3 authored over 9 years ago
Merge "Track keymaster method changes"

fd92fe1463f5df1bbfc1a46d2790d940d998368c authored over 9 years ago
Track keymaster method changes

Change-Id: If0b274118a2d238b18c0a06ee3fe7f0798a44a1c

773a2ba83309dc531c5a4b61ec0658bd6ee67dab authored over 9 years ago
Merge "Remove references to Google in Android keymaster."

8521f7a41c717a064960f7535b1665b96a8dbba4 authored over 9 years ago
am 3a7d9e62: Rewrite legacy methods in terms of new methods

* commit '3a7d9e626fa6c0e116c07be912c319aad6e08614':
Rewrite legacy methods in terms of new me...

970957d6e6a8a4a2b1cd2e958a7f1dd5b17e108f authored over 9 years ago
Rewrite legacy methods in terms of new methods

Rewrite generate, import, get_pubkey, sign and verify using the new
keymaster 1.0 methods (gener...

3a7d9e626fa6c0e116c07be912c319aad6e08614 authored over 9 years ago
am 3cc40125: Allow keymaster 0.3 keys to interopt with keymaster 1.0 methods

* commit '3cc40125e8b495e7f0784dad53bb9acdb5b9a8eb':
Allow keymaster 0.3 keys to interopt with...

6a9b7b647eec60a9e1cbe9cbdc3fb05f85d67b46 authored over 9 years ago
Allow keymaster 0.3 keys to interopt with keymaster 1.0 methods

Keymaster 0.3 keys are all valid keymaster 1.0 keys, so allow get to
return a keymaster 0.3 when...

3cc40125e8b495e7f0784dad53bb9acdb5b9a8eb authored over 9 years ago
am f82cd5c8: Merge "Add optional additional entropy to finish" into mnc-dev

* commit 'f82cd5c843faddb89156d331c8d96522878a0524':
Add optional additional entropy to finish

658f20cbe7d8f9919afd3ed696a86e5cf29a8e51 authored over 9 years ago
Merge "Add optional additional entropy to finish" into mnc-dev

f82cd5c843faddb89156d331c8d96522878a0524 authored over 9 years ago
Add optional additional entropy to finish

If provided the extra entropy will be added to the device before calling
finish. If entropy is p...

0d33e0babec356b1e69f1f15e8d9fe2ad878762c authored over 9 years ago
Fix build breakage due to bad merge conflict resolution

Change-Id: I66294362fe272a424d5be65171ca6ddcb8287aaf

c1591d0ea246287e9267c323d8665adb5bf56b53 authored over 9 years ago
am 8c683b98: Merge "Use keymaster adapter to support older devices" into mnc-dev

* commit '8c683b98e0b7ed1aa319f727f1d87ba5c410b30b':
Use keymaster adapter to support older de...

b45c4979c7d9bc59e59a37ba68e584c43335ace9 authored over 9 years ago
Merge "Use keymaster adapter to support older devices" into mnc-dev

8c683b98e0b7ed1aa319f727f1d87ba5c410b30b authored over 9 years ago
am 9ac7a27a: Merge "Fix potential use-after-free in hw auth token handling." into mnc-dev

* commit '9ac7a27ae009692a5f8b630c79017e43e24a37e0':
Fix potential use-after-free in hw auth t...

3a4b3316b06a369b2bd38078b4e5fb5f542d8a2b authored over 9 years ago
Merge "Fix potential use-after-free in hw auth token handling." into mnc-dev

9ac7a27ae009692a5f8b630c79017e43e24a37e0 authored over 9 years ago
Fix potential use-after-free in hw auth token handling.

The operation map caches the hw_auth_token used to start the operation
but it was storing the po...

999f1b05261837d6571fa4effa357a9af1d8d01a authored over 9 years ago
resolved conflicts for merge of 57e106dc to mnc-dev-plus-aosp

Change-Id: I7d753e87c43945a1a02bfa2d62000ffb96aea858

b2d68d151b68153f92fc9e615ad164e3ce873fb6 authored over 9 years ago
Track keymaster method changes

Change-Id: If0b274118a2d238b18c0a06ee3fe7f0798a44a1c

57e106dc183744cdc05c62bea11bc285b3346846 authored over 9 years ago
Use keymaster adapter to support older devices

The keymaster adapter wraps the hardware module to allow keystore to
call the new keymaster meth...

bd07a239085228c25898bc6cdece8b1b8758df83 authored over 9 years ago
am 4673027c: Merge "Add optional additional entropy to finish"

* commit '4673027c75ae95de9ea468d4722a39e4434596ac':
Add optional additional entropy to finish

9f429a9054d37299c2fd2e4b2687fd0a7ccab4eb authored over 9 years ago
Merge "Add optional additional entropy to finish"

4673027c75ae95de9ea468d4722a39e4434596ac authored over 9 years ago
Add optional additional entropy to finish

If provided the extra entropy will be added to the device before calling
finish. If entropy is p...

8cfb8ac6e9bd291e9d861a32de2719e3bc797191 authored over 9 years ago
am 7d0e9a41: Set flags correctly for softkeymaster.

* commit '7d0e9a4170ec1b1ed0f80c1a75131dadf3dd6abe':
Set flags correctly for softkeymaster.

6ca760ac2b8b9b63b7cab422aec6977320c3c80f authored over 9 years ago
Set flags correctly for softkeymaster.

Change-Id: Ib7f4996d2e2002db4892d5585761a053f6698495
(cherry picked from commit e1faa9fe7fa7066f...

7d0e9a4170ec1b1ed0f80c1a75131dadf3dd6abe authored over 9 years ago
Remove references to Google in Android keymaster.

Also, remove unneeded inclusion of key_blob.h.

Change-Id: I05de61353fc806b90232fab7c1d1cf76aefa...

c40558f48a5786cdbdfd43271c65cdf5e9d0f480 authored over 9 years ago
am 70d41381: Merge "Remove references to Google in Android keymaster." into mnc-dev

* commit '70d41381f5d2f8af863ba0b4fb5be53423c49c4c':
Remove references to Google in Android ke...

cc0e7c089617fe3a7ad62d054f3e811350e299f5 authored over 9 years ago
Merge "Remove references to Google in Android keymaster." into mnc-dev

70d41381f5d2f8af863ba0b4fb5be53423c49c4c authored over 9 years ago
am e6c3bfa8: Cleanup keystore API

* commit 'e6c3bfa8d39c7addbfbac0b2df63b0067bb664d8':
Cleanup keystore API

bbb98ea800f8682c9efb08ce1576834ed44c0e7a authored over 9 years ago
Remove references to Google in Android keymaster.

Also, remove unneeded inclusion of key_blob.h.

Change-Id: I05de61353fc806b90232fab7c1d1cf76aefa...

0bdad21c560552ec324733fb5db734fec204a2e9 authored over 9 years ago
Cleanup keystore API

Remove old methods that were replaced by onUser* methods, rename methods
with unclear names, and...

e6c3bfa8d39c7addbfbac0b2df63b0067bb664d8 authored over 9 years ago
am 9bee6bd6: Merge "Cleanup keystore API"

* commit '9bee6bd6335d6e82f8227ba2c268d31361b048fc':
Cleanup keystore API

322510553c466ec5107727689607734b4e559119 authored over 9 years ago
Merge "Cleanup keystore API"

9bee6bd6335d6e82f8227ba2c268d31361b048fc authored over 9 years ago
am c0f031a8: Add onUserAdded/Removed methods

* commit 'c0f031a867a6c3fa05732fcd72bd284d56073cf8':
Add onUserAdded/Removed methods

5c883e8fced65e388bb8df9fdce4fbb727c97228 authored over 9 years ago
am 72593ee8: Refactor uids to user ids where appropriate

* commit '72593ee807e89239d98ae08d32c733ecc08203ba':
Refactor uids to user ids where appropriate

f9879326a8cd2f8ebc81692e95be11b1428528e9 authored over 9 years ago
Add onUserAdded/Removed methods

These will handle the logic of Android users being added/removed from
the device instead of the ...

c0f031a867a6c3fa05732fcd72bd284d56073cf8 authored over 9 years ago
Refactor uids to user ids where appropriate

UserState related methods previously took uid's while the state was
based on userId, with the ne...

72593ee807e89239d98ae08d32c733ecc08203ba authored over 9 years ago
am 838173b1: Merge "Fix missing ALOG argument"

* commit '838173b1e056f51a921b6a326e44efbfc667c6ce':
Fix missing ALOG argument

bd84058a03e055e39e8c6ce0f45cabde0dab3900 authored over 9 years ago
am 6069e06a: Merge "Refactor uids to user ids where appropriate"

* commit '6069e06a5220c1eaebdfdca454ebc471251741ac':
Refactor uids to user ids where appropriate

0424587e9e4120fe06ea1f5f3ce9d40d0b8c1460 authored over 9 years ago
am 1932efc8: Merge "Add onUserAdded/Removed methods"

* commit '1932efc82007d4bbee5afbc29009d6ae6f780980':
Add onUserAdded/Removed methods

f6ad7dfe13f74395ab2ae7fab3b8b86fb55d1641 authored over 9 years ago
am cefb6d7c: Merge "Set flags correctly for softkeymaster."

* commit 'cefb6d7c5fa63fb1cc144f7feb6829e8bdd6a5e3':
Set flags correctly for softkeymaster.

010d23505debc8a3f206bab10ffff20dfee5ddbc authored over 9 years ago