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

174796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
aee4a86a04 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-25 13:45:21 +00:00
Geoff Mendal
ce64b99e44 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-25 13:44:55 +00:00
Geoff Mendal
91d95328da Import translations. DO NOT MERGE 
Change-Id: I077436f56f383af0746ee1c7037ba8bef0d1d6d6
Auto-generated-cl: translation import
 2015-02-25 07:41:18 -06:00
Geoff Mendal
5d7482adc1 Import translations. DO NOT MERGE 
Change-Id: Ib4c512a4856bdce8518bf1ee1a36ca5fc19a324b
Auto-generated-cl: translation import
 2015-02-25 05:41:09 -08:00
Geoff Mendal
53ddd69ea7 Import translations. DO NOT MERGE 
Change-Id: I14e100832a693f7e5cfa8d53edd90ebb1745c064
Auto-generated-cl: translation import
 2015-02-25 05:35:06 -08:00
Joe Fernandez
4e3e6fb16e am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit '9afbbb2e600936ef7a402fecd0402a3e59cf864e':
  docs: Android for Work developer landing page
 2015-02-25 13:27:07 +00:00
Andrew Solovay
2557fb070a am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit 'd7cddbd2d595cd5ee2cb9e7e05af8a760f265f84':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 13:27:03 +00:00
Andrew Solovay
d6f1fbe04c am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit '9ac09b6c553060d0104aa8fb3f38f4dfd81a8957':
  docs: New "implementing app restrictions" doc
 2015-02-25 13:26:58 +00:00
Chris Craik
7914fa5ce6 am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit '661b54ae2a55461aa70c07d069550b911c14f800':
  Explain behavior of boundless ripple projection
 2015-02-25 13:26:53 +00:00
Joe Fernandez
9afbbb2e60 am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit '8ffb574a5087b2099cef5f629568375caa0ddc9c':
  docs: Android for Work developer landing page
 2015-02-25 13:16:20 +00:00
Andrew Solovay
d7cddbd2d5 am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit '7391b0a177f9ecf3c8e3a9657bbf1ae7000ce528':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 13:16:15 +00:00
Andrew Solovay
9ac09b6c55 am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit '93df7f0740a6d2044c29227ac6f684c74aa49ff7':
  docs: New "implementing app restrictions" doc
 2015-02-25 13:16:11 +00:00
Chris Craik
661b54ae2a am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit '7fc5b5a129a3599c4a213117415e113a85d09745':
  Explain behavior of boundless ripple projection
 2015-02-25 13:16:06 +00:00
Joe Fernandez
8ffb574a50 am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit 'f7224396ee8416630b9387995a79faae1ee68b7c':
  docs: Android for Work developer landing page
 2015-02-25 13:09:56 +00:00
Andrew Solovay
7391b0a177 am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit 'e64301e639e73f346a78584af2727bc98f3d81ae':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 13:09:33 +00:00
Andrew Solovay
93df7f0740 am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926':
  docs: New "implementing app restrictions" doc
 2015-02-25 13:09:29 +00:00
Chris Craik
7fc5b5a129 am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d':
  Explain behavior of boundless ripple projection
 2015-02-25 13:09:24 +00:00
Joe Fernandez
f7224396ee am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528':
  docs: Android for Work developer landing page
 2015-02-25 08:06:01 +00:00
Joe Fernandez
c427b721b6 am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page
 2015-02-25 07:59:48 +00:00
Joe Fernandez
4141882623 Merge "docs: Android for Work developer landing page" into lmp-docs 2015-02-25 07:52:30 +00:00
Andrew Solovay
e64301e639 am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit '790b1bc864d9066ff691b0e12a4e14ef85566c50':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 07:49:37 +00:00
Andrew Solovay
790b1bc864 am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 07:42:44 +00:00
Andrew Solovay
d3cd0948c8 docs: New doc for creating an AfW Work Policy Controller 
See first comment for doc stage location.

Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415
 2015-02-24 23:31:41 -08:00
Jim Miller
bc4f2ccf6c Remove TrustAgent whitelisting API 
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
 2015-02-24 20:15:02 -08:00
Joe Fernandez
108ccac1a1 docs: Android for Work developer landing page 
Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
 2015-02-24 17:32:30 -08:00
Andrew Solovay
032e931a80 am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit '6ffe1058463e5f4e65aa131796b37c0443d1b44b':
  docs: New "implementing app restrictions" doc
 2015-02-25 01:14:58 +00:00
Andrew Solovay
6ffe105846 am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit 'a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c':
  docs: New "implementing app restrictions" doc
 2015-02-25 01:07:25 +00:00
Rich Slogar
69044ae842 docs: note to install linux packages v2 update 
b.android 155803

Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834
 2015-02-24 17:01:58 -08:00
Andrew Solovay
a2ae6c9dbf Merge "docs: New "implementing app restrictions" doc" into lmp-docs 2015-02-25 01:01:56 +00:00
Filip Gruszczynski
23958c6e2f Force translucency from windowIsTranslucent on SwipeDismissLayout. 
Bug: 18799741

Change-Id: Ifb05869f1bf080d7555d7728dc085c41cc2c277c
 2015-02-24 16:59:45 -08:00
Chris Craik
a9ad0fc793 am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
  Explain behavior of boundless ripple projection
 2015-02-25 00:26:51 +00:00
Andrew Solovay
79cb98c6ce docs: New "implementing app restrictions" doc 
New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.

Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac
 2015-02-24 16:20:27 -08:00
Chris Craik
f2525ed3f4 am ea2a0648: Explain behavior of boundless ripple projection 
* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection
 2015-02-25 00:18:51 +00:00
Chris Craik
ea2a0648a8 Explain behavior of boundless ripple projection 
Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
 2015-02-25 00:12:38 +00:00
Narayan Kamath
287c53f4a8 am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '76507a64b530c757dc284f1f4d0807ffbfd9a701':
  Track removal of refcounts from FileMap.
 2015-02-24 13:04:43 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
 2015-02-24 12:56:52 +00:00
Narayan Kamath
72dc62ead2 Merge "Track removal of refcounts from FileMap." 2015-02-24 12:50:57 +00:00
Narayan Kamath
fd335f8467 am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment
 2015-02-24 10:18:39 +00:00
Narayan Kamath
948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment
 2015-02-24 10:11:52 +00:00
Narayan Kamath
6e208cddad Merge "Remove wrong javadoc comment" 2015-02-24 10:04:33 +00:00
Joe LaPenna
57bb5f5c8b am c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 
* commit 'c0c395162ff14b83694158663470ad60e065d9a9':
  Hold a wake lock while dozing when display updates are pending.
 2015-02-24 00:46:48 +00:00
Joe LaPenna
c0c395162f Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 2015-02-24 00:37:15 +00:00
Chad Brubaker
f271fa33f1 am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'cdc70256f47b1797520f2bb5c63b21bd441ed8d9':
  Add new IKeystoreService methods to KeyStore
 2015-02-23 22:53:07 +00:00
Chad Brubaker
3576ca1f9b am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '1629f9543a48e93515395a10c50d0394f8be2774':
  Add Keymaster 0.4 binder API
 2015-02-23 22:53:01 +00:00
Chad Brubaker
cdc70256f4 am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'f3c117ca0d116b01174732790be1939282d0a5a0':
  Add new IKeystoreService methods to KeyStore
 2015-02-23 22:45:11 +00:00
Chad Brubaker
1629f9543a am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API
 2015-02-23 22:45:01 +00:00
Chad Brubaker
f3c117ca0d Merge "Add new IKeystoreService methods to KeyStore" 2015-02-23 22:20:59 +00:00
Chad Brubaker
598f9b2a19 Merge "Add Keymaster 0.4 binder API" 2015-02-23 22:20:39 +00:00
Chad Brubaker
e6a461341c Add new IKeystoreService methods to KeyStore 
Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.

Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9
 2015-02-23 14:12:44 -08:00
Chad Brubaker
45ff13ea28 Add Keymaster 0.4 binder API 
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
 2015-02-23 14:12:37 -08:00