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

176774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
7f72f74766 Merge "Add BNNM intrinsic." 2015-04-15 22:30:14 +00:00
Shawn Willden
763100e644 am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." 
* commit '1cb119d3f0945f2194d400b7f186df92bbb25567':
  Unbreak obtaining symmetric keys from AndroidKeyStore.
 2015-04-15 18:10:04 +00:00
Shawn Willden
1cb119d3f0 am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." 
* commit '71ba4e461f7a492b44632e282e6480345ac4b9c8':
  Unbreak obtaining symmetric keys from AndroidKeyStore.
 2015-04-15 17:59:41 +00:00
Shawn Willden
71ba4e461f Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." 2015-04-15 17:37:37 +00:00
Rich Slogar
caa15d49f9 docs: studio remove gradle tasks dialog 
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
 2015-04-15 10:30:18 -07:00
Geoff Mendal
360d0f615e Import translations. DO NOT MERGE 
Change-Id: Ic858a50c432b07464acba53ea9775aab3e98c633
Auto-generated-cl: translation import
 2015-04-15 07:28:29 -07:00
Michael Wright
6fb80b704e am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()" 
* commit '99e23088843eddede29d0fc5ca30a83f147f31b0':
  fix return value scale of notifyANR()
 2015-04-15 11:21:06 +00:00
Michael Wright
99e2308884 am 150e0e87: Merge "fix return value scale of notifyANR()" 
* commit '150e0e87e1faa01f927cfe8c7110ef843612a1df':
  fix return value scale of notifyANR()
 2015-04-15 11:10:58 +00:00
Michael Wright
150e0e87e1 Merge "fix return value scale of notifyANR()" 2015-04-15 10:53:21 +00:00
Martijn Coenen
1f440cb0b8 am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()." 
* commit '895f3c27269d14ec53ff3ae8526342f9b57a10e1':
  Add getPrefixAids().
 2015-04-15 09:51:52 +00: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
Alex Klyubin
5eacd777fe Unbreak obtaining symmetric keys from AndroidKeyStore. 
This tracks 59f977c6988e21b3b8aa6c83428bd6ee1a98816d due to which
AndroidKeyStore is unable to provide symmetric keys because it
assumes that the digest field is not repeating.

Bug: 18088752
Change-Id: Ie8ed01449280b7c759e81aeaf2066953b0abaf2a
 2015-04-14 19:02:46 -07:00
baik.han
def340d45e fix return value scale of notifyANR() 
fix return value scale of notifyANR()
from milliseconds to nanoseconds when windowState is not null
This prevent unintended frequent method calls of notifyANR()
in a very short time.

Change-Id: Icc1f363b3ed3538821a42c080809567473bfb833
Signed-off-by: Baik Han <baik.han@lge.com>
 2015-04-15 10:21:05 +09:00
Joe Fernandez
808042e6c2 am e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit 'e635f9b5e078e9e6f15f5828832acffb497c05e7':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 01:15:23 +00:00
Joe Fernandez
e635f9b5e0 am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '726466c22517a1dc4d549edfd32fc5447794d29e':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 00:55:08 +00:00
Joe Fernandez
726466c225 am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '110020229e0a31b060a329dfe55181f98a31e802':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 00:45:20 +00:00
Hiroshi Yamauchi
4bb374bb35 am d83a598c: am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()." 
* commit 'd83a598c392af8daf9c82f28b5c920955712f528':
  Fix javadoc error in Debug.getRuntimeStats().
 2015-04-15 00:24:58 +00: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
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