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

213515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
0540e1b127 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." am: e766e399c5 
am: 4bc1904119

* commit '4bc1904119875dd0e8c63f87106e8ab293cc9a7a':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
 2015-11-25 19:13:21 +00:00
Alex Klyubin
4bc1904119 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." 
am: e766e399c5

* commit 'e766e399c59669156284c330ae3f38f79230d930':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
 2015-11-25 19:05:09 +00:00
Alex Klyubin
e766e399c5 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." 2015-11-25 18:59:35 +00:00
Alex Klyubin
d976c5a4ee Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer). 
This makes Android Keystore's Cipher implementation use a custom
implementation of engineUpdate(ByteBuffer, ByteBuffer) and
engineDoFinal(ByteBuffer, ByteBuffer). The implementation is
explicitly designed around the fact that Android Keystore transmits
input and receives output via Binder and thus there's no need to
attempt any optimizations to avoid copying input and output.

Bug: 25863382
Change-Id: I311072891f02f5e7a283628b51b8d6058b55231c
 2015-11-24 17:22:27 -08:00
Jim Kaye
b159adb4a8 Merge "Extend the \'qwerty\' key layout" am: 9a83f115ad 
am: e579edc76b

* commit 'e579edc76b6f3f8c977d96db6af01d73e6c93804':
  Extend the 'qwerty' key layout
 2015-11-24 19:42:14 +00:00
Jim Kaye
e579edc76b Merge "Extend the \'qwerty\' key layout" 
am: 9a83f115ad

* commit '9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
  Extend the 'qwerty' key layout
 2015-11-24 19:33:57 +00:00
Jim Kaye
9a83f115ad Merge "Extend the 'qwerty' key layout" 2015-11-24 19:27:46 +00:00
Sergio Giro
dd52b3db36 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" am: d5a5d547d0 
am: d9942006e4

* commit 'd9942006e4a45884fffda8e5888d9657f40b48d2':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
 2015-11-24 15:51:13 +00:00
Sergio Giro
d9942006e4 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" 
am: d5a5d547d0

* commit 'd5a5d547d05eee9d626db1d7977c11acbf83b0c7':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
 2015-11-24 15:43:06 +00:00
Sergio Giro
d5a5d547d0 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" 2015-11-24 11:14:24 +00:00
Kevin Neas
28c7363e8d Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585 am: b6ae32162e 
am: 32a7d85f64

* commit '32a7d85f64a193745de81ee94b7b4d7adefb3f02':
  DO NOT MERGE. Cherrypick UiBench from Master
 2015-11-24 02:54:07 +00:00
Kevin Neas
32a7d85f64 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585 
am: b6ae32162e

* commit 'b6ae32162e77d9f11620b6806dec20a0987e2dab':
  DO NOT MERGE. Cherrypick UiBench from Master
 2015-11-24 02:46:24 +00:00
Kevin Neas
b6ae32162e Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev 
am: 4dbb586585

* commit '4dbb58658552d1cdae46ef06d331b867f5610786':
  DO NOT MERGE. Cherrypick UiBench from Master
 2015-11-24 01:58:00 +00:00
Kevin Neas
4dbb586585 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev 2015-11-24 00:50:18 +00:00
Jim Kaye
b45d99d7d9 Extend the 'qwerty' key layout 
Add the App Switch (Recents) key.
Add media control keys.

These are needed to support Emulator UI
buttons for these functions.

Change-Id: I3e9479bb49e21400f7bfd1435c50886038bbe0ff
 2015-11-23 12:22:59 -08:00
Geoff Mendal
3ed855b01a Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: d273c053ce  -s ours

* commit 'd273c053ce85585d223d152bacf6e9e4c6859d1e':
  Import translations. DO NOT MERGE
 2015-11-23 17:58:21 +00:00
Geoff Mendal
d273c053ce Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2015-11-23 17:51:14 +00:00
Geoff Mendal
fa49e87f5e Import translations. DO NOT MERGE 
Change-Id: I6553e9e4da9e5e5c33aad42aa215d8d328f66509
Auto-generated-cl: translation import
 2015-11-23 18:50:05 +01:00
Geoff Mendal
4b66f74aae Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ae7c51a9cc -s ours 
am: 57b3e7508d  -s ours

* commit '57b3e7508d1adb81cbe3b5aff24fbaaa71de9ce2':
  Import translations. DO NOT MERGE
 2015-11-23 17:46:15 +00:00
Geoff Mendal
57b3e7508d Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: ae7c51a9cc  -s ours

* commit 'ae7c51a9ccf1bc1030b33a64b095a4fe3b06a3bd':
  Import translations. DO NOT MERGE
 2015-11-23 17:38:52 +00:00
Geoff Mendal
ae7c51a9cc Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2015-11-23 17:32:02 +00:00
Geoff Mendal
2542f81bb1 Import translations. DO NOT MERGE 
Change-Id: I000a0799900cec827d9df803e0aa6e0fdb28b236
Auto-generated-cl: translation import
 2015-11-23 18:30:39 +01:00
Sergio Giro
46972b2d82 ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl 
Needed by AbstractVerifier in framework/base

DistinguishedNameParser taken from libcore, commit
b5259fcf87994ee18658f07887156aef3cab3b56

Change-Id: I924dc7cd21262e5e91857edf178e46c9916f3f6b
 2015-11-23 15:46:15 +00:00
Geoff Mendal
e309a7f951 Import translations. DO NOT MERGE am: b21b778567 -s ours am: b96f640a77 -s ours 
am: 816a167b29  -s ours

* commit '816a167b2936a420d96f57f57005982e727745f5':
  Import translations. DO NOT MERGE
 2015-11-23 13:51:05 +00:00
Geoff Mendal
816a167b29 Import translations. DO NOT MERGE am: b21b778567 -s ours 
am: b96f640a77  -s ours

* commit 'b96f640a77b0c09868e104028d3bb9db3687018b':
  Import translations. DO NOT MERGE
 2015-11-23 13:43:48 +00:00
Geoff Mendal
b96f640a77 Import translations. DO NOT MERGE 
am: b21b778567  -s ours

* commit 'b21b7785678f08e939dbe2e7d7cb5eedae47e1c4':
  Import translations. DO NOT MERGE
 2015-11-23 13:36:02 +00:00
Geoff Mendal
b21b778567 Import translations. DO NOT MERGE 
Change-Id: Id46055ddba8834518c0faf5e0dd95d883dd79542
Auto-generated-cl: translation import
 2015-11-23 14:26:59 +01:00
Adam Lesinski
6cd5beed50 DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am: 6902052c77 -s ours am: 888916ff0f -s ours 
am: 29db6ccb72  -s ours

* commit '29db6ccb72b1b43568f2045825cf5435bd661e00':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
 2015-11-20 20:27:01 +00:00
Adam Lesinski
29db6ccb72 DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am: 6902052c77 -s ours 
am: 888916ff0f  -s ours

* commit '888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
 2015-11-20 20:20:14 +00:00
Adam Lesinski
888916ff0f DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing 
am: 6902052c77  -s ours

* commit '6902052c77bbcb9078b4ced243874f67542f64f9':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
 2015-11-20 20:14:08 +00:00
Adam Lesinski
6902052c77 DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing 
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.

Bug:25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
 2015-11-20 10:58:02 -08:00
Chris Tate
96333c2e8c Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde 
am: b5a38f6da5

* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
  Don't back up / restore EAP network definitions
 2015-11-20 18:10:21 +00:00
Chris Tate
b5a38f6da5 Merge "Don\'t back up / restore EAP network definitions" 
am: 14a0981fde

* commit '14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
  Don't back up / restore EAP network definitions
 2015-11-20 18:05:04 +00:00
Chris Tate
14a0981fde Merge "Don't back up / restore EAP network definitions" 2015-11-20 18:01:10 +00:00
Geoff Mendal
4943634c10 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours am: fd773d1ba7 -s ours 
am: b1a5fef946  -s ours

* commit 'b1a5fef946bf5ec1c9bb59696cad9534ba72190b':
  Import translations. DO NOT MERGE
 2015-11-20 01:56:21 +00:00
Deepanshu Gupta
adca23bb4c Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 am: 2d887558df 
am: 0627cd0c40

* commit '0627cd0c404838a0251ee359ed75041f430fa83b':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
 2015-11-20 01:55:01 +00:00
Deepanshu Gupta
138a901db4 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465 
am: 4d9df358ec

* commit '4d9df358ec847262872c09962105537be350f8fd':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
 2015-11-20 01:53:43 +00:00
Sreeram Ramachandran
9ebdd27142 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 am: 5d41bd8d1a am: c1552f0caf 
am: 38a3b2154c

* commit '38a3b2154c7ee5d75b5670abaa4c154edd3c36eb':
  Don't use framework permission strings for netd permissions.
 2015-11-20 01:52:25 +00:00
Vineeta Srivastava
8e8c12acfa Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd 
am: cb948af246

* commit 'cb948af2469ca3869d368c0162dd459912afb0b9':
  Fix MVNO hotspot bug for Europe
 2015-11-20 01:51:01 +00:00
Geoff Mendal
b1a5fef946 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours 
am: fd773d1ba7  -s ours

* commit 'fd773d1ba76c29b8888c71906ef44ec09a551627':
  Import translations. DO NOT MERGE
 2015-11-20 01:40:42 +00:00
Geoff Mendal
fd773d1ba7 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours 
am: 1bd58bfd5b  -s ours

* commit '1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
  Import translations. DO NOT MERGE
 2015-11-20 01:30:35 +00:00
Geoff Mendal
1bd58bfd5b Import translations. DO NOT MERGE am: bddde9b83d -s ours 
am: d0709c3a32  -s ours

* commit 'd0709c3a329ce555d9d968bc1808fec5bcc1fb10':
  Import translations. DO NOT MERGE
 2015-11-20 01:25:11 +00:00
Geoff Mendal
d0709c3a32 Import translations. DO NOT MERGE 
am: bddde9b83d  -s ours

* commit 'bddde9b83db2bab9343cbe107d3672fea5314d4b':
  Import translations. DO NOT MERGE
 2015-11-20 01:15:04 +00:00
Geoff Mendal
bddde9b83d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
 2015-11-20 01:07:33 +00:00
Guang Zhu
723462eba9 add lost RAM info to compact meminfo dump am: 877c6c7742 
am: b681ec0219

* commit 'b681ec02194039768767215b2479507742288c98':
  add lost RAM info to compact meminfo dump
 2015-11-20 00:01:31 +00:00
Alex Deymo
f7d10eca49 Merge "Remove the aidl tool" into mnc-dr2-dev 
am: 8d31b08904

* commit '8d31b089040dafefee16033176a884d43e259804':
  Remove the aidl tool
 2015-11-19 23:50:25 +00:00
Deepanshu Gupta
0627cd0c40 Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 
am: 2d887558df

* commit '2d887558dfa0b46fde5663fb494e2230febeaccc':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
 2015-11-19 21:10:57 +00:00
Deepanshu Gupta
4d9df358ec Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 
am: 867c370465

* commit '867c3704652d40118b47e9c97149e7fd9567a16b':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
 2015-11-19 21:09:24 +00:00
Deepanshu Gupta
2d887558df Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev 
am: 35f7562495

* commit '35f75624958bc061764c7cc71843ca7ea60c0666':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
 2015-11-19 21:00:17 +00:00
Deepanshu Gupta
867c370465 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev 
am: 8c971ae5a0

* commit '8c971ae5a0d294175481426d4543e23dc8d4a349':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
 2015-11-19 20:58:52 +00:00