Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,489 Commits 3 Branches 0 Tags
c29f30cbf1ee6bec3b2ead374aba71002db6faaa
Commit Graph

176489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
c29f30cbf1 am 9e58689d: am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '9e58689da633b5ec4517ac17bd7274510992143d':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 02:55:04 +00:00
Mathieu Chartier
7e39ae4fd6 am 32b675b9: am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit '32b675b9f56210afb0254b866235ebfa7908d39c':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:55:00 +00:00
Rich Slogar
9e58689da6 am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '9761530b3fbff0f2d686c4a0f48efa02c159a309':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 02:43:49 +00:00
Mathieu Chartier
32b675b9f5 am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit 'd4bcbcfa08502d6feafbe39e9dcb16a38e61f892':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:43:39 +00:00
Ruchi Kandoi
36e53bb8aa am 1770f9cf: am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds." 
* commit '1770f9cfa546dbacb622550ef845c2dcb7f9b995':
  BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds.
 2015-04-14 00:47:17 +00:00
Ruchi Kandoi
1770f9cfa5 am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds." 
* commit '3afca74a2a40b4e957630909fe5df76aa550da69':
  BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds.
 2015-04-14 00:35:03 +00:00
Ruchi Kandoi
3afca74a2a Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds." 2015-04-14 00:17:14 +00:00
Yang Ni
a0be50e403 am 7591574d: am 07cd641b: Merge "Add a name to ScriptGroup2.Builder.create method" 
* commit '7591574d8490e0c985a73372607addccb2b0282f':
  Add a name to ScriptGroup2.Builder.create method
 2015-04-13 23:21:54 +00:00
Yang Ni
7591574d84 am 07cd641b: Merge "Add a name to ScriptGroup2.Builder.create method" 
* commit '07cd641b6f832f939d5cccfe8604c230ddad4257':
  Add a name to ScriptGroup2.Builder.create method
 2015-04-13 23:10:58 +00:00
Yang Ni
07cd641b6f Merge "Add a name to ScriptGroup2.Builder.create method" 2015-04-13 22:52:31 +00:00
Yang Ni
ad6b44aaa1 Add a name to ScriptGroup2.Builder.create method 
The name is not used in any meaningful way yet, but would be used
to name the file for generated code for fused kernels in other
coming CLs.

A script group name cannot be null or empty, or longer than 100
characters. It can only contain letters, digits, '-', or '_'.

Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b
 2015-04-13 14:32:18 -07:00
Rich Slogar
9761530b3f am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '8f68c77cec98a24fd43ad0a5e2d3946d2a16e15e':
  docs: nexus usb driver update
 2015-04-13 18:53:08 +00:00
Rich Slogar
904d498312 am 6843ae30: am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs 
* commit '6843ae308ea8d62aa44dda3e7ad95c6e292513af':
  docs: remove adb install option
 2015-04-13 18:53:01 +00:00
Rich Slogar
8f68c77cec am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '6656ea4607d8250a611eddb07de890213ea31426':
  docs: nexus usb driver update
 2015-04-13 18:42:58 +00:00
Rich Slogar
6843ae308e am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs 
* commit 'c0559808eeb881ce5afa368c51f3da3807359d56':
  docs: remove adb install option
 2015-04-13 18:42:54 +00:00
Rich Slogar
6656ea4607 am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '880460a704c79b0d81c1aa8af9b3c163c8adf16d':
  docs: nexus usb driver update
 2015-04-13 18:30:33 +00:00
Rich Slogar
c0559808ee am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs 
* commit 'a7ade2f7f0c496cb12edfc4ae805fd08c9c2359d':
  docs: remove adb install option
 2015-04-13 18:30:29 +00:00
Rich Slogar
880460a704 Merge "docs: nexus usb driver update" into lmp-docs 2015-04-13 18:13:47 +00:00
Rich Slogar
a7ade2f7f0 Merge "docs: remove adb install option" into lmp-docs 2015-04-13 18:13:10 +00:00
Mathieu Chartier
d4bcbcfa08 am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit 'dd9e41407552fb44ad2d537966611d574269f45f':
  Update "Investigating your RAM usage" for ART
 2015-04-13 17:47:24 +00:00
Mathieu Chartier
dd9e414075 am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit 'f2a4968b3fd2292943d5fa5c54246b87d3637076':
  Update "Investigating your RAM usage" for ART
 2015-04-13 17:37:44 +00:00
Alex Klyubin
a978a3d6e9 am f265bdbf: am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests." 
* commit 'f265bdbfc70411c08b4aa7d17125cf1b5e9b14e8':
  Use JCA names for block modes, paddings, and digests.
 2015-04-13 17:31:40 +00:00
Mathieu Chartier
f2a4968b3f Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 2015-04-13 17:29:02 +00:00
Alex Klyubin
f265bdbfc7 am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests." 
* commit 'd1af38a4783c1c0d1a5b7c76a7583beb02a88462':
  Use JCA names for block modes, paddings, and digests.
 2015-04-13 17:22:07 +00:00
Alex Klyubin
d1af38a478 Merge "Use JCA names for block modes, paddings, and digests." 2015-04-13 17:01:30 +00:00
Alex Klyubin
5927c9f1b1 Use JCA names for block modes, paddings, and digests. 
This replaces int-based enums from KeyStoreKeyConstraints with
String values commonly used in JCA API.

As part of under the hood refactoring:
* KeyStoreKeyCharacteristics and KeyStoreKeyConstraints have been
  merged into KeyStoreKeyProperties.
* KeymasterUtils methods operating on KeymasterArguments and
  KeymasterCharacteristics have been moved to their respective
  classes.

Bug: 18088752
Change-Id: I9c8b984cb3c28184adb617e34d87f2837bd1d3a1
 2015-04-13 09:59:04 -07:00
Wale Ogunwale
110919d995 am bd59764a: am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider" 
* commit 'bd59764a2c20deeebe945c5008abf9a62df09a1e':
  Clean-up state if we have an exception when acquiring provider
 2015-04-13 04:56:21 +00:00
Wale Ogunwale
bd59764a2c am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider" 
* commit '8f0e0c1f3d7c02dff6fe4877477af583e490e6ee':
  Clean-up state if we have an exception when acquiring provider
 2015-04-13 04:46:31 +00:00
Wale Ogunwale
8f0e0c1f3d Merge "Clean-up state if we have an exception when acquiring provider" 2015-04-13 04:25:29 +00:00
Geoff Mendal
dd804d908d am 55295c76: (-s ours) am 08c21adc: (-s ours) Import translations. DO NOT MERGE 
* commit '55295c76fd43930da196f4275c9f6e27b756692c':
  Import translations. DO NOT MERGE
 2015-04-11 10:08:46 +00:00
Geoff Mendal
55295c76fd am 08c21adc: (-s ours) Import translations. DO NOT MERGE 
* commit '08c21adc91058e97ee6761cfd3a250b64f567d39':
  Import translations. DO NOT MERGE
 2015-04-11 09:59:00 +00:00
Geoff Mendal
3de3bb22a6 Import translations. DO NOT MERGE 
Change-Id: Ia69d7347d0e753efa924d1b61b416b08affa3329
Auto-generated-cl: translation import
 2015-04-10 23:14:36 -07:00
Geoff Mendal
08c21adc91 Import translations. DO NOT MERGE 
Change-Id: I239fc7724d745a1abbac73e673ecfe408ce17c9b
Auto-generated-cl: translation import
 2015-04-10 23:07:04 -07:00
Alex Klyubin
651dbfde73 am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto." 
* commit 'ad48c4c9c194d66dcc96e74e906825ca7b550e24':
  Add EcIesParameterSpec to enable ECIES crypto.
 2015-04-11 02:45:17 +00:00
Alex Klyubin
ad48c4c9c1 am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto." 
* commit 'c1c6528d2b686d5a17e577e7864a319dcba7c224':
  Add EcIesParameterSpec to enable ECIES crypto.
 2015-04-11 02:35:45 +00:00
David Friedman
d34b20e957 am a22125ff: am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit 'a22125ff98085c0fe662966cadfe4c889707db54':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 02:27:01 +00:00
Alex Klyubin
c1c6528d2b Merge "Add EcIesParameterSpec to enable ECIES crypto." 2015-04-11 02:17:01 +00:00
David Friedman
a22125ff98 am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '23b5e508adfb454552fda16d76d65b070a53f759':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 02:15:48 +00:00
David Friedman
23b5e508ad am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '340a617ef42951446bbc730833cea207370307d0':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 02:05:57 +00:00
David Friedman
340a617ef4 am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '746fed63567c548c7b55c14e1532d059753bfa52':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 01:55:32 +00:00
David Friedman
746fed6356 am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '3a77a8aeea1a40ca5c2cdb0b66a877032118d89f':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 01:46:19 +00:00
David Friedman
3a77a8aeea Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 2015-04-11 01:36:57 +00:00
Mathieu Chartier
d92c6bde3f Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
 2015-04-10 18:34:51 -07:00
Chad Brubaker
93976df800 am 3a9779b6: am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth" 
* commit '3a9779b6edf9b118d8907a8124cd53c05f72aa00':
  Fix testSaw_ungrantedUid_Bluetooth
 2015-04-10 22:17:00 +00:00
Chad Brubaker
3a9779b6ed am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth" 
* commit '386c4e9ea976377d87950427472a593c22b1b205':
  Fix testSaw_ungrantedUid_Bluetooth
 2015-04-10 22:09:18 +00:00
Shawn Willden
c88e1396db am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable" 
* commit '99f4ac144506d307b38ab112d1054e5fe18a7217':
  Make several key crypto parameters repeatable
 2015-04-10 22:01:15 +00:00
Alex Klyubin
0ee9376ef4 Add EcIesParameterSpec to enable ECIES crypto. 
Bug: 18088752
Change-Id: I597b019106c500188e0fbbc9608722668c08b421
 2015-04-10 14:57:28 -07:00
Shawn Willden
99f4ac1445 am 97fce66f: Merge "Make several key crypto parameters repeatable" 
* commit '97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f':
  Make several key crypto parameters repeatable
 2015-04-10 21:51:22 +00:00
Chad Brubaker
386c4e9ea9 Merge "Fix testSaw_ungrantedUid_Bluetooth" 2015-04-10 21:42:23 +00:00
Shawn Willden
97fce66f7d Merge "Make several key crypto parameters repeatable" 2015-04-10 21:21:37 +00:00