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

176327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Mathieu Chartier
2f0dc15519 am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '2c871d2cce8e926c5300fdee33526eeb5e81810c':
  Update "Investigating your RAM usage" for ART
 2015-04-13 21:10:29 +00:00
smain@google.com
2b92e18b4b am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit '76c9e47e9fb7e81a6bbebeee83a77efb55799b23':
  initial batch of NDK files for skeleton site build
 2015-04-13 21:10:15 +00:00
Mathieu Chartier
2c871d2cce am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '17781b68df70a9c0bc446d91739be651d4c9a9e3':
  Update "Investigating your RAM usage" for ART
 2015-04-13 20:57:26 +00:00
smain@google.com
76c9e47e9f am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit '4301dd0458a0789f6cc841d9e8b18e645e73c05d':
  initial batch of NDK files for skeleton site build
 2015-04-13 20:57:22 +00:00
Mathieu Chartier
17781b68df am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '473989c35d9f0a42c6e7d3a56004dc76676b65b5':
  Update "Investigating your RAM usage" for ART
 2015-04-13 20:52:51 +00:00
smain@google.com
4301dd0458 am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'd60649c541931a5a9e5972cdceac48b9042eaff4':
  initial batch of NDK files for skeleton site build
 2015-04-13 20:44:52 +00:00
Mathieu Chartier
473989c35d Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 2015-04-13 20:44:18 +00:00
smain@google.com
d60649c541 Merge "initial batch of NDK files for skeleton site build" into lmp-docs 2015-04-13 20:32:38 +00:00
smain@google.com
0178321af6 initial batch of NDK files for skeleton site build 
Change-Id: I00152e817377c072f529940743499a3b6d91f80d
 2015-04-13 12:51:19 -07:00
Rich Slogar
6b9e30fe95 am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '12020cf4418fd5b0918b6df1d6a072be01aac622':
  docs: systrace update
 2015-04-13 18:53:14 +00: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
12020cf441 am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '3e664c3bda8ee1cb3b2819ba38a8195147ad448a':
  docs: systrace update
 2015-04-13 18:43:04 +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
3e664c3bda am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit 'bdc20109208d16144cd052b281e25e6e243b2547':
  docs: systrace update
 2015-04-13 18:30:38 +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
bdc2010920 Merge "docs: systrace update" into lmp-docs 2015-04-13 18:14:06 +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
Mathieu Chartier
2c957d4cb9 Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
(cherry picked from commit d92c6bde3fc61e1ea90c54e4fd19d72f0b1a3987)
 2015-04-13 17:29:15 +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
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
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