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

163641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
19847b07e8 am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API
 2015-02-25 18:09:54 +00:00
Jim Miller
b46e48067f Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 2015-02-25 18:04:58 +00:00
Geoff Mendal
bb463806aa Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 15:41:24 +00:00
Geoff Mendal
70228b3929 Import translations. DO NOT MERGE 
Change-Id: I4e5b922995cf7eff9c984735209e2fe073fb5d83
Auto-generated-cl: translation import
 2015-02-25 07:39:28 -08:00
Geoff Mendal
c2cbbb8906 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 14:09:55 +00:00
Geoff Mendal
ecac2cb4d2 Import translations. DO NOT MERGE 
Change-Id: I84339eebbf7a8e2332e85a104b85ec740a25d6f1
Auto-generated-cl: translation import
 2015-02-25 06:08:29 -08:00
Geoff Mendal
a4f544540e Import translations. DO NOT MERGE 
Change-Id: I5974f01d8313faa999068ffd844ecbafb9ab4321
Auto-generated-cl: translation import
 2015-02-25 06:02:34 -08: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
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
Sanket Padawe
ea4713d6e5 Changing usage of carrier name field of SubInfoRecord 
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
 2015-02-24 13:15:15 -08:00
Jason Monk
de3260b5bf Keyguard: Use plmn/spn broadcast when no SIMs 
The keyguard needs to show either 'emergency calls only' or 'no service'
depending on whether there is service available, so try to pull this from
the old sticky broadcast containing plmn/spn.

Bug: 19476978
Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001
 2015-02-24 10:13:47 -05:00
Junda Liu
985f52cde5 Fix incorrect condition for sub id check. 
Bug: b/19277299
Change-Id: Iea6806926f0e9d9404a3f2613d03b8a0607fea54
 2015-02-23 16:06:51 -08:00
Deepanshu Gupta
68501b87d2 Better error msg for StateList/Hexadecimal Color. 
Throw a better error message when resolving a hexadecimal color value
but the user gave a Color State List. The two are easy to confuse since
the only way to distinguish between the two is to look at the
definition.

Bug: http://b.android.com/70110
Change-Id: Ic78962bd0674a92296a0fdd0de184cfe4d85a8e4
 2015-02-23 12:00:38 -08:00
Rich Slogar
6de010f600 docs: remove exploring sdk link 
b.android 153523

Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
 2015-02-23 11:37:36 -08:00
Deepanshu Gupta
5ed4fc9efd am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '99142d298213e93f673057c2334b04b38f7e4450':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:15:57 +00:00
Deepanshu Gupta
99142d2982 am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:09:14 +00:00
Deepanshu Gupta
3f8e2b9302 am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:03:29 +00:00
Deepanshu Gupta
30a67cd17a Merge "Set forceFramework correctly for included layouts." into lmp-dev 2015-02-23 18:56:27 +00:00
David Friedman
d77380b856 am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '3570268bcf1e4c375d8b592714f8b7be25819873':
  Fixes several typos.
 2015-02-23 18:26:10 +00:00
David Friedman
fcbc842878 am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit 'f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:26:06 +00:00
David Friedman
3570268bcf am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803':
  Fixes several typos.
 2015-02-23 18:20:37 +00:00
David Friedman
f066c2358d am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '18c8a35fa4e775c3b515e739b0f32981395914ad':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:20:32 +00:00
David Friedman
09e9076ddf am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit 'ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
  Fixes several typos.
 2015-02-23 18:13:36 +00:00
David Friedman
18c8a35fa4 am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '8e604689c8c8f8ad073e12094991daa712cd8f38':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:13:32 +00:00
David Friedman
ab0f8ff740 am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.
 2015-02-23 18:06:47 +00:00
David Friedman
8e604689c8 am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:06:43 +00:00
David Friedman
88e0145fb8 Merge "Fixes several typos." into lmp-docs 2015-02-23 18:05:36 +00:00
David Friedman
3c26756aef Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 2015-02-23 18:02:26 +00:00