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

47992 Commits

Author SHA1 Message Date
ztenghui
059451e185 am 23606598: DO NOT MERGE: Reset the Node status when clone. 
* commit '23606598244c2a297d994895eaf631b240d33242':
  DO NOT MERGE: Reset the Node status when clone.
 2015-04-22 00:43:08 +00:00
Andreas Gampe
fb861b6c8d am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 
* commit '31fb202e6f6687f86ec4fc33b18aafacbf67c797':
  Frameworks/base: Compile-time optimize SQLiteConnection
 2015-04-21 23:59:57 +00:00
Andreas Gampe
31fb202e6f Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 2015-04-21 23:31:51 +00:00
Mathieu Chartier
765d7c3048 am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API" 
* commit 'ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
  Update getExportedPropertyMethods to new reflection API
 2015-04-21 23:26:49 +00:00
Andreas Gampe
c7f9f7656f am 189d2785: Merge "Frameworks/base: Fix comment" 
* commit '189d2785c3b71eac9c122c874586501a2ab723b2':
  Frameworks/base: Fix comment
 2015-04-21 23:26:41 +00:00
Mathieu Chartier
ba6783b69a Merge "Update getExportedPropertyMethods to new reflection API" 2015-04-21 23:03:35 +00:00
Andreas Gampe
4f47b40e05 Frameworks/base: Compile-time optimize SQLiteConnection 
Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).

Bug: 19498458
Bug: 19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a
 2015-04-21 16:01:00 -07:00
ztenghui
2360659824 DO NOT MERGE: Reset the Node status when clone. 
b/20457797

Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
 2015-04-21 20:31:58 +00:00
Mathieu Chartier
a8a6516f62 Update getExportedPropertyMethods to new reflection API 
Bug: 19264997

Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
 2015-04-21 11:52:10 -07:00
Andreas Gampe
dd8e5fbe96 Frameworks/base: Fix comment 
Fix comment in ZygoteInit.

Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39
 2015-04-21 09:01:51 -07:00
Andreas Gampe
1f4f92ed74 am b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit" 
* commit 'b6feabcfce080c2dc906434cf05ff606489cf39d':
  Frameworks/base: Use better Class.forName in ZygoteInit
 2015-04-21 04:26:53 +00:00
Andreas Gampe
c917f74d92 Frameworks/base: Use better Class.forName in ZygoteInit 
Use the three-argument version of Class.forName. This saves an
expensive stack lookup for the caller's class-loader on each
invocation.

Bug: 19498458
Change-Id: I859affde31e580fd2de3f70ee0a9295936c2d9f4
 2015-04-20 19:17:54 -07:00
Martijn Coenen
cb4776254c am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks." 
* commit 'e386f7f5108e9c2aa7547394f23d5936d7993cfe':
  Expose peer LLCP version in NDEF callbacks.
 2015-04-17 07:25:27 +00:00
Martijn Coenen
e386f7f510 Merge "Expose peer LLCP version in NDEF callbacks." 2015-04-17 07:02:59 +00:00
Filip Gruszczynski
47e743b9e2 am 4544b927: Hold a wake lock while dozing when wallpaper draws. 
* commit '4544b927d7f3575bf609490b42d521a12bf95a07':
  Hold a wake lock while dozing when wallpaper draws.
 2015-04-17 00:59:39 +00:00
Chad Brubaker
a9d740003f am e5e49a17: Merge "Support KM_LONG_REP" 
* commit 'e5e49a175c27b95d6b8928ab435bfde9f9db3c81':
  Support KM_LONG_REP
 2015-04-16 22:23:29 +00:00
Filip Gruszczynski
4544b927d7 Hold a wake lock while dozing when wallpaper draws. 
This mimics what ViewRootImpl does before drawing.

Bug: 20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
 2015-04-16 15:00:58 -07:00
Chad Brubaker
e5e49a175c Merge "Support KM_LONG_REP" 2015-04-16 21:56:13 +00:00
Chad Brubaker
b543b39354 Support KM_LONG_REP 
Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0
 2015-04-16 14:39:51 -07:00
Alex Klyubin
51884f0e06 am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." 
* commit '499126c43385ba7bce9b8547b61bafd0c6311147':
  Add Keymaster KM_ORIGIN_UNKNOWN constant.
 2015-04-16 20:09:05 +00:00
Alex Klyubin
499126c433 Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." 2015-04-16 19:50:12 +00:00
Alex Klyubin
a2607ee4eb am b9a78c79: Merge "Add IV-related Keymaster error codes." 
* commit 'b9a78c7939e9b31c807106166cafe65dc5af777d':
  Add IV-related Keymaster error codes.
 2015-04-16 16:57:12 +00:00
Alex Klyubin
37d81d035c Add IV-related Keymaster error codes. 
Bug: 18088752
Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
 2015-04-15 17:18:19 -07:00
Martijn Coenen
fd70bb1367 Expose peer LLCP version in NDEF callbacks. 
Change-Id: I98b9a9764b66345f842c1f845c8a386161d965f5
 2015-04-15 12:33:37 +02:00
Martijn Coenen
895f3c2726 am 6a47a861: Merge "Add getPrefixAids()." 
* commit '6a47a86112e271d200f77d5ec66f5f50979135ca':
  Add getPrefixAids().
 2015-04-15 09:37:56 +00:00
Martijn Coenen
6a47a86112 Merge "Add getPrefixAids()." 2015-04-15 08:00:13 +00:00
Martijn Coenen
ed3a29ea08 Add getPrefixAids(). 
Bug: 19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
 2015-04-15 09:48:57 +02:00
Hiroshi Yamauchi
d83a598c39 am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()." 
* commit '82992b7270842637d1af3dcc7c9ae954bdfa312c':
  Fix javadoc error in Debug.getRuntimeStats().
 2015-04-15 00:11:01 +00:00
Hiroshi Yamauchi
d8001676ea Fix javadoc error in Debug.getRuntimeStats(). 
Bug: 19825248
Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054
 2015-04-14 16:08:49 -07:00
Hiroshi Yamauchi
04143fdd55 am e38ee9df: Merge "Add Debug.getRuntimeStat()." 
* commit 'e38ee9df26c93415303152ec3f6ed50d847557c8':
  Add Debug.getRuntimeStat().
 2015-04-14 19:26:51 +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
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
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
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
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
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
59f977c698 Make several key crypto parameters repeatable 
Bug: 19509156
Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
 2015-04-10 12:20:04 -06:00
Alex Klyubin
c5f9683c06 am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'a270264c61daa42a5b03bbb1e7f23e77780f8fc0':
  Track more changes to keymaster_defs.h
 2015-04-10 18:09:27 +00:00
Wale Ogunwale
73e239bdc9 Clean-up state if we have an exception when acquiring provider 
We can get a number of exceptions (e.g. SecurityException) when
a process is acquiring a provider. We need to clean-up correctly
so that other threads that try to acquire the provider the progress.

Bug: 20122809
Change-Id: Icac1d391df7e8c24198be89035b1c5a23da834cf
 2015-04-10 09:32:26 -07:00
Alex Klyubin
55f7c2770f Track more changes to keymaster_defs.h 
KeyStoreTest needed to be adjusted because OCB is no longer supported.

Bug: 18088752
Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
 2015-04-10 08:58:38 -07:00
Alex Klyubin
5f8c17b9f6 am ba2836e6: Merge "Track recent keymaster_defs.h changes." 
* commit 'ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
  Track recent keymaster_defs.h changes.
 2015-04-10 00:22:45 +00:00
Alex Klyubin
862e6c7814 Track recent keymaster_defs.h changes. 
Bug: 18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
 2015-04-09 16:58:58 -07:00
Richard Uhler
7f7571308d am f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat." 
* commit 'f324d245fdd07ac14ab312d1a5fa04a4e8dfcceb':
  Reuse dexopt method for both dex2oat and patchoat.
 2015-04-09 14:31:10 +00:00