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

176599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Albert
7b09e7a9f3 am 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt." 
* commit '44d7989abfe41ffa2d4a5cfba8c0d2f880ac9b8d':
  Fix UB in ResourceTable::stringToInt.
 2015-04-14 23:55:35 +00:00
Hiroshi Yamauchi
82992b7270 Merge "Fix javadoc error in Debug.getRuntimeStats()." 2015-04-14 23:49:03 +00:00
Dan Albert
44d7989abf am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt." 
* commit '571c5a26f767f67118f34ca0d426aeeb4a287b2c':
  Fix UB in ResourceTable::stringToInt.
 2015-04-14 23:44:51 +00:00
Dan Albert
571c5a26f7 Merge "Fix UB in ResourceTable::stringToInt." 2015-04-14 23:25:27 +00:00
Hiroshi Yamauchi
d8001676ea Fix javadoc error in Debug.getRuntimeStats(). 
Bug: 19825248
Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054
 2015-04-14 16:08:49 -07:00
Tim Murray
9cb16a2f91 Add BNNM intrinsic. 
Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404
 2015-04-14 15:10:19 -07:00
Alex Klyubin
1d5a259276 am 6a38c86d: am d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec." 
* commit '6a38c86dd892b272a354d2b1164e78eebaaf907e':
  No need to specify EC curve name in EcIesParameterSpec.
 2015-04-14 20:55:34 +00:00
Alex Klyubin
6a38c86dd8 am d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec." 
* commit 'd693690aee3ee94878ab59ee86d8db8ce5bb3789':
  No need to specify EC curve name in EcIesParameterSpec.
 2015-04-14 20:43:46 +00:00
Alex Klyubin
fa2bd4fe5c am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cert parameters optional." 
* commit '888f5cb7166936f468831d64ac88197c15f0584f':
  Make specifying self-signed cert parameters optional.
 2015-04-14 20:31:02 +00:00
Alex Klyubin
d693690aee Merge "No need to specify EC curve name in EcIesParameterSpec." 2015-04-14 20:22:52 +00:00
Alex Klyubin
888f5cb716 am ecfda064: Merge "Make specifying self-signed cert parameters optional." 
* commit 'ecfda06461b8c4a770eb47edb2f7052d7bd0c62d':
  Make specifying self-signed cert parameters optional.
 2015-04-14 20:20:57 +00:00
Joe Fernandez
110020229e am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '5b6e91a6717c4d6aa34adbbb2f2b5d6625c0802d':
  docs: Add Cross-References to Material Design Spec
 2015-04-14 20:14:32 +00:00
Joe Fernandez
5b6e91a671 am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit 'af5f200038d377033a5c22e6f93bc49a9e67444d':
  docs: Add Cross-References to Material Design Spec
 2015-04-14 20:04:56 +00:00
Alex Klyubin
ecfda06461 Merge "Make specifying self-signed cert parameters optional." 2015-04-14 19:59:03 +00:00
Alex Klyubin
67d21aef98 Make specifying self-signed cert parameters optional. 
This removes the need to specify the three parameters of the
self-signed certificate (serial number, subject, validity range) when
generating key pairs in AndroidKeyStore. This is achieved by
providing sensible defaults for these parameters:
* serial number: 1
* subject: CN=fake
* validity range: Jan 1 1970 to Jan 1 2048.

Bug: 18088752
Change-Id: I5df918b1ef8b26ed3ddd43828c4c78c9fa58cd43
 2015-04-14 12:56:17 -07:00
Joe Fernandez
af5f200038 Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 2015-04-14 19:55:36 +00:00
Joe Fernandez
49ca2de88a docs: Add Cross-References to Material Design Spec 
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
 2015-04-14 12:53:12 -07:00
Hiroshi Yamauchi
d9e0abdf85 am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()." 
* commit '04143fdd55196886e5dbf1a1c7fe334115e81a42':
  Add Debug.getRuntimeStat().
 2015-04-14 19:37:56 +00:00
Hiroshi Yamauchi
04143fdd55 am e38ee9df: Merge "Add Debug.getRuntimeStat()." 
* commit 'e38ee9df26c93415303152ec3f6ed50d847557c8':
  Add Debug.getRuntimeStat().
 2015-04-14 19:26:51 +00:00
Hiroshi Yamauchi
e38ee9df26 Merge "Add Debug.getRuntimeStat()." 2015-04-14 19:08:30 +00:00
Alex Klyubin
45d27836bd Add Keymaster KM_ORIGIN_UNKNOWN constant. 
This tracks d359b044830b292f492f8a8df5471f869e358399 from
hardware/libhardware.

Bug: 18088752
Change-Id: I9a7bd8bdee51c18ae0427eff4efe036213d2b175
 2015-04-14 10:52:34 -07:00
Hiroshi Yamauchi
8b5a293d09 Add Debug.getRuntimeStat(). 
Export runtime stats (currently GC stats) through this method.

Bug: 19825248
Change-Id: I147a0e9bc6bdfe4dc29d74e44f0af6349c51d9f8
 2015-04-14 10:33:10 -07:00
Yang Ni
0933905375 am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method" 
* commit '6ca1e45aab5b4a1b229c6493780a04976db12817':
  Add name to ScriptGroup2.Builder.create() method
 2015-04-14 16:50:22 +00:00
Yang Ni
6ca1e45aab am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method" 
* commit '8704ae464a001e17275257d19eae688ff3a28892':
  Add name to ScriptGroup2.Builder.create() method
 2015-04-14 16:36:36 +00:00
Yang Ni
8704ae464a Merge "Add name to ScriptGroup2.Builder.create() method" 2015-04-14 16:15:54 +00:00
Erik Kline
73e056d393 am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()" 
* commit '402f2501ac73adba86ec3973ef81e6911fbcd564':
  Add android.net.IpPrefix#contains()
 2015-04-14 09:44:25 +00:00
Erik Kline
402f2501ac am 3312c6b9: Merge "Add android.net.IpPrefix#contains()" 
* commit '3312c6b9f3e9c83865eeec2af609338ce74a0a10':
  Add android.net.IpPrefix#contains()
 2015-04-14 09:29:56 +00:00
Erik Kline
3312c6b9f3 Merge "Add android.net.IpPrefix#contains()" 2015-04-14 07:58:33 +00:00
Erik Kline
acc8c09d3a Add android.net.IpPrefix#contains() 
This was originally to avoid RuntimeException in RouteInfo#matches():
    When an IPv6 prefix with a length greater than the max permitted
    for IPv4 is matched against an Inet4Address, the call to
    NetworkUtils throws RuntimeException.

Change-Id: I92e2bd19a4e7d656cf682fd27678da07e211850d
 2015-04-14 16:19:11 +09:00
Dirk Dougherty
38544901e6 am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'f2a57c69d4af3f7b1368e6edb6801b1cf2058dd8':
  Doc change: add new pages for Designed for Families.
 2015-04-14 05:03:13 +00:00
Dirk Dougherty
f2a57c69d4 am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'cda895c53d22496001ae59fae36f751cf04af3ed':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:54:32 +00:00
Dirk Dougherty
cda895c53d am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'c578bff74acdaf103c05794f39acf9ea49e4621d':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:43:06 +00:00
Dirk Dougherty
c578bff74a am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'a80fc040ea814af2a1d3f2cbfa5efb8eaa898697':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:33:27 +00:00
Dirk Dougherty
a80fc040ea am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit '00f857c5a132555774bd286c254dade281473427':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:22:27 +00:00
Dirk Dougherty
00f857c5a1 Merge "Doc change: add new pages for Designed for Families." into lmp-docs 2015-04-14 04:12:57 +00:00
Dirk Dougherty
f802cc02a2 Doc change: add new pages for Designed for Families. 
Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
 2015-04-13 20:23:18 -07:00
Mathieu Chartier
9426ad32bc am 869c5490: am 2f0dc155: am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '869c5490214c99cacb05024cfc72efa4cffb9208':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:55:17 +00:00
smain@google.com
f46c8f5bfc am c9393a5d: am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'c9393a5d707529a465fe68ee96d9929deb8ef3c8':
  initial batch of NDK files for skeleton site build
 2015-04-14 02:55:13 +00:00
Rich Slogar
7fd2be12d1 am f828c92c: am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit 'f828c92c5ebbcba3204581b49e91b5b80f8ed2b4':
  docs: systrace update
 2015-04-14 02:55:09 +00:00
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
Mathieu Chartier
869c549021 am 2f0dc155: am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '2f0dc1551958088fdf20f89eb98f34d00b21bf3d':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:44:26 +00:00
smain@google.com
c9393a5d70 am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit '2b92e18b4bf70c88662dfa1137c4901daae4d4d5':
  initial batch of NDK files for skeleton site build
 2015-04-14 02:44:14 +00:00
Rich Slogar
f828c92c5e am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '6b9e30fe959e6c67687c52eeb152de623368695d':
  docs: systrace update
 2015-04-14 02:43:56 +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
Yang Ni
35be56cce8 Add name to ScriptGroup2.Builder.create() method 
This name will be used to name the .so file generated for the
script group with fused kernels.

Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
 2015-04-13 17:24:44 -07:00
Ruchi Kandoi
3afca74a2a Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds." 2015-04-14 00:17:14 +00:00