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

176613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luan Nguyen
ee066f576e Merge "cherrypick from lmp-docs docs: Add Wear Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0" into lmp-mr1-ub-docs 2015-04-22 21:58:08 +00:00
Luan Nguyen
836f569870 cherrypick from lmp-docs docs: Add Wear Capability training 
Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0

bug: 20088602
Change-Id: I968dfe13a9d74cae52bedeb9cb333f514d188cb4
 2015-04-21 13:16:27 -07:00
Luan Nguyen
3499773195 cherrypick from lmp-docs docs: Add Channel API summary for Wear. 
Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb

bug: 20089257
Change-Id: I25ad962ef847574d2152229ebb2ce268483c2a68
 2015-04-21 13:13:22 -07:00
Quddus Chong
8408cbe3ad cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support 
Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
bug: 20304402

Change-Id: I697f57335b671d5f17685c1f82d7c9158e6d4ce6
 2015-04-21 09:33:09 -07:00
Kris Giesing
0ab9655ae1 Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs 2015-04-20 22:03:47 +00:00
Kris Giesing
6cf2d35d3b Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs 2015-04-20 22:03:31 +00:00
Kris Giesing
6c97440849 DO NOT MERGE Revert "Load libraries directly from apk" 
This reverts commit dec4688f40b0018fbd1f00db05581966f531d88f.

Change-Id: Ief869dec1641d5a376bc044719941536e0bf8442
 2015-04-20 14:15:59 -07:00
Kris Giesing
e863712afc DO NOT MERGE Revert "Add android.net.IpPrefix#contains()" 
This reverts commit acc8c09d3a12d00b565a76acc26061172c3dd3c6.

Change-Id: I3c11ddd66d22ab2756201b489127f1643fedb429
 2015-04-20 14:15:43 -07:00
Kris Giesing
663cdc5cfd Tweak wording on release notes for Leanback. 
Change-Id: I1450fef7100d4b557e5dab65bbb2681235f05439
 2015-04-20 11:12:06 -07:00
Rich Slogar
1c6c22d3a9 docs: support library 22.1 updates 
Change-Id: Ia784597a6b55d322bca3aaf07b35c53d3b4b182c
(cherry picked from commit 1e517de5fcc1da97c0e33e57ee19c930a188a7d5)
 2015-04-20 01:19:54 +00:00
Ryosuke Matsuuchi
2fb3dc2f96 doc: Add Korean version of DAC/distribute/ page. 
Bug: 20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
(cherry picked from commit 19a7b546190f91c93089084f854e277083094961)
 2015-04-19 23:08:14 +00:00
Dirk Dougherty
7e75d3ec4b Doc change: distribute landing page. 
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
(cherry picked from commit 1792ec17b8a352a2469e2136c6ea9bb34d99b282)
 2015-04-19 23:06:59 +00:00
Joe Fernandez
7ce1ab5ffb Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs 2015-04-19 23:05:28 +00:00
Rich Slogar
6b1b71c963 docs: hierarchyviewer updates 
b/19955159

Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
(cherry picked from commit f9f81b49d04ba5beb5a360265e808a7d6e9ed269)
 2015-04-19 22:37:34 +00:00
Rich Slogar
d07ace2f65 docs: studio remove gradle tasks dialog 
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
(cherry picked from commit caa15d49f968720f51a096b93e0412e97db269a1)
 2015-04-19 22:25:18 +00:00
Alex Klyubin
b1aa7d0bc8 am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." 
* commit '51884f0e066bcf1ba5e039cd8a24a87139b5a01c':
  Add Keymaster KM_ORIGIN_UNKNOWN constant.
 2015-04-16 20:20:15 +00: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
Deepanshu Gupta
186fe7b10f am c4affce9: am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit 'c4affce9df0817b84df3e61c3932f53b77ee0986':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:55:03 +00:00
Deepanshu Gupta
c4affce9df am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit '1f3c7f3f500bdbfd790c20872961d84ef617f066':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:41:54 +00:00
Brian Carlstrom
81d0aabcb5 am 40955edf: am 14a982aa: Merge "Document hprof-conv -z" 
* commit '40955edf9dc1e90b337af89543919eec4868dbe0':
  Document hprof-conv -z
 2015-04-16 17:41:44 +00:00
Brian Carlstrom
40955edf9d am 14a982aa: Merge "Document hprof-conv -z" 
* commit '14a982aa7a38fa89c916c252996632d401b1d043':
  Document hprof-conv -z
 2015-04-16 17:31:34 +00:00
Deepanshu Gupta
1f3c7f3f50 am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit 'f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:31:34 +00:00
Deepanshu Gupta
f18ceefcf0 am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit 'cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:19:42 +00:00
Deepanshu Gupta
cd6e00c6d9 Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev 
* changes:
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:12:45 +00:00
Brian Carlstrom
14a982aa7a Merge "Document hprof-conv -z" 2015-04-16 17:08:00 +00:00
Alex Klyubin
f39aa3d089 am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes." 
* commit 'a2607ee4ebef49f88b5656e2eca2db362b32c70d':
  Add IV-related Keymaster error codes.
 2015-04-16 17:07:51 +00:00
Alex Klyubin
22b5d9b969 am 28a9089f: am 216d18b9: Merge "Remove IV auto-generation workaround." 
* commit '28a9089f5b79e20ca5b023830255cf438a9cded7':
  Remove IV auto-generation workaround.
 2015-04-16 17:07:47 +00:00
Brian Carlstrom
d7931acf4a Document hprof-conv -z 
Bug: 18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
 2015-04-16 10:06:58 -07: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
28a9089f5b am 216d18b9: Merge "Remove IV auto-generation workaround." 
* commit '216d18b997eb929c2c3af9b2102595f4ec694c20':
  Remove IV auto-generation workaround.
 2015-04-16 16:57:05 +00:00
Alex Klyubin
b9a78c7939 Merge "Add IV-related Keymaster error codes." 2015-04-16 16:39:31 +00:00
Alex Klyubin
216d18b997 Merge "Remove IV auto-generation workaround." 2015-04-16 16:39:10 +00:00
Miao Wang
133911095c am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java" 
* commit '2b300a99bbb133090b7ec39e64dd65ba2bb8f18d':
  [RenderScript] typo fix in Allocation.java
 2015-04-16 02:32:59 +00:00
Miao Wang
2b300a99bb am 782b4339: Merge "[RenderScript] typo fix in Allocation.java" 
* commit '782b43394ef48e7cf8e75404c534a46074d42d4e':
  [RenderScript] typo fix in Allocation.java
 2015-04-16 02:21:37 +00:00
Miao Wang
782b43394e Merge "[RenderScript] typo fix in Allocation.java" 2015-04-16 02:03:32 +00:00
Deepanshu Gupta
54862febaf Update golden image for tests. 
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
 2015-04-15 18:20:57 -07:00
Deepanshu Gupta
37dbb8b7f3 Update to using LayoutlibCallback. 
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
 2015-04-15 18:20:56 -07:00
Deepanshu Gupta
49ce36e175 Remove implementation of deprecated method. 
BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.

Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
 2015-04-15 18:20:55 -07:00
Deepanshu Gupta
9ca9774726 Add @empty support. 
Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
 2015-04-15 18:20:47 -07:00
Miao Wang
179e8b5351 [RenderScript] typo fix in Allocation.java 
Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
 2015-04-15 17:44:32 -07:00
Alex Klyubin
a0d2dddc55 Remove IV auto-generation workaround. 
This workaround prevents use of keys with randomized encryption
(IND-CPA). Since randomized encryption is on by default, it's better
to keep it working and break non-randomized encryption (until
Keymaster is fixed).

Bug: 18088752
Change-Id: I4b11ce72cff705be41d3e66f28b507d6ddc1da79
 2015-04-15 17:20:23 -07:00
Alex Klyubin
37d81d035c Add IV-related Keymaster error codes. 
Bug: 18088752
Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
 2015-04-15 17:18:19 -07:00
Tim Murray
3d9c9093d1 am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic." 
* commit '91d2f27bc7dad2232d3f59c71f1402b86cb9f514':
  Add BNNM intrinsic.
 2015-04-15 23:04:41 +00:00
Tim Murray
91d2f27bc7 am 7f72f747: Merge "Add BNNM intrinsic." 
* commit '7f72f74766fed73ae9816fec6031a199f70d1428':
  Add BNNM intrinsic.
 2015-04-15 22:50:11 +00:00
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
Geoff Mendal
360d0f615e Import translations. DO NOT MERGE 
Change-Id: Ic858a50c432b07464acba53ea9775aab3e98c633
Auto-generated-cl: translation import
 2015-04-15 07:28:29 -07:00