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

124208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
755c930a51 am b17420b8: Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev 
* commit 'b17420b81ebe7e1235a45ad3e7ce8c1850c129f2':
  add toggle for IDE instructions, revise some titles and other cleanup to Google API setup
 2014-06-17 03:24:16 +00:00
Robert Ly
48e337ae33 am 696b3cd9: docs: fix links 
* commit '696b3cd96f0c0d061b3f860412ad1e6cf34b64c9':
  docs: fix links
 2014-06-17 03:19:13 +00:00
Robert Ly
696b3cd96f docs: fix links 
Change-Id: Ibbf3e24893d953a65cb1ef2dd31cf1174a40ebf6
 2014-06-16 20:10:49 -07:00
Robert Ly
f141f48fb4 am 483af3bf: docs: fix lmp index 
* commit '483af3bf9e0de4d84b6b36fddf458d35ba5728d6':
  docs: fix lmp index
 2014-06-17 00:05:15 +00:00
Dan Albert
7bd2992504 Use openssl's SHA1 instead of bionic's. 
Bionic is removing its SHA1.

Change-Id: I2b2d028223d2299666511a683cffba29c55639b7
 2014-06-16 17:01:21 -07:00
Robert Ly
483af3bf9e docs: fix lmp index 
Change-Id: If3f696cba65bcd9a126a1abde6d4b2a0bda84767
 2014-06-16 16:56:09 -07:00
Chris Craik
88b1c9ad87 am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI." 
* commit 'e709d53ff31c74a6abf2a27350966d18d8dad4f7':
  Fix the texture ID reuse issue in HWUI.
 2014-06-16 23:47:34 +00:00
Chris Craik
678886fde5 am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence" 
* commit 'b1fc06a4321f13360fcca49bbf87f87f34c22d58':
  hwui: fix possible null pointer de-refrence
 2014-06-16 23:47:26 +00:00
Chris Craik
e709d53ff3 am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI." 
* commit '0d28bb47d771a2ac99cec6e4a071a98d2cd705dd':
  Fix the texture ID reuse issue in HWUI.
 2014-06-16 23:43:21 +00:00
Chris Craik
b1fc06a432 am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence" 
* commit '5e7ef9489f3247c02395202d88fb4fb425aa8412':
  hwui: fix possible null pointer de-refrence
 2014-06-16 23:43:16 +00:00
Tim Murray
9dad7d44d2 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-16 16:20:36 -07:00
Robert Ly
90fd93c0ef am d458e3f4: delete tv 
* commit 'd458e3f4d8eb888470404701c37c8bc9cddfa993':
  delete tv
 2014-06-16 23:18:21 +00:00
Robert Ly
3a437c7846 am 208eb3e8: Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev 
* commit '208eb3e84a8ec3458b8cda7afd969e890261a018':
  Android TV DevGuide home fix (no pic)
 2014-06-16 23:13:30 +00:00
Robert Ly
d458e3f4d8 delete tv 
Change-Id: I22058850b4186951e69ada51959ef9f86054b1b1
 2014-06-16 16:10:42 -07:00
Robert Ly
2c7fefe339 am f5135c28: Merge "docs: Material design doc fixes from editorial review." into klp-modular-dev 
* commit 'f5135c283f1771ab0e1de66cb015a0abeb48eae2':
  docs: Material design doc fixes from editorial review.
 2014-06-16 22:55:46 +00:00
Robert Ly
605b00b97f am 13bc25bf: Merge "docs: misc l-prev fixes" into klp-modular-dev 
* commit '13bc25bf4c5b47183b8eda68099314dd2a6ec47b':
  docs: misc l-prev fixes
 2014-06-16 22:32:46 +00:00
Chris Craik
0d28bb47d7 Merge "Fix the texture ID reuse issue in HWUI." 2014-06-16 22:13:20 +00:00
Chris Craik
5e7ef9489f Merge "hwui: fix possible null pointer de-refrence" 2014-06-16 22:13:20 +00:00
smain@google.com
b17420b81e Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev 2014-06-16 22:12:26 +00:00
smain@google.com
7332669e39 add toggle for IDE instructions, revise some titles and other cleanup to Google API setup 
Change-Id: Ic2454824adddb80ac844939f165cc68fc52a7005
 2014-06-16 20:12:30 -07:00
Robert Ly
f5135c283f Merge "docs: Material design doc fixes from editorial review." into klp-modular-dev 2014-06-16 22:12:26 +00:00
Ricardo Cervera
d9a70a7aaa docs: Material design doc fixes from editorial review. 
Change-Id: I2a7a9d39e85cc9c9d5f19f7265aaa6dc8c5dba12
 2014-06-16 15:43:22 -07:00
Michael Kolb
b936c57c2c am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev 
* commit 'a730881d769cfe0bdce1faafae2c3b88f86d6978':
  DO NOT MERGE : Fix measuring with outset for orientation
 2014-06-16 20:55:39 +00:00
Colin Cross
289476b65b am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote" 
* commit 'a803542aad4a58fe2446b8bf9cc4a4f59942d084':
  clean up native com.android.internal.os.Zygote
 2014-06-16 20:19:05 +00:00
Colin Cross
a803542aad am cb634bda: Merge "clean up native com.android.internal.os.Zygote" 
* commit 'cb634bda7b0130015509b0e4d236d10b20b2340d':
  clean up native com.android.internal.os.Zygote
 2014-06-16 20:14:40 +00:00
Colin Cross
18cd9f5762 clean up native com.android.internal.os.Zygote 
This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.

Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
 2014-06-16 12:22:56 -07:00
Tenghui Zhu
ecae1ffd77 am df36dd20: am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" 
* commit 'df36dd200c55a6ad463b46bab0ffff49d21206ff':
  update parameters in uploadToTexture() for GLES20
 2014-06-16 17:18:51 +00:00
Tenghui Zhu
df36dd200c am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" 
* commit '386caf6c8f276f1d03ea077bc799df2a937ef500':
  update parameters in uploadToTexture() for GLES20
 2014-06-16 17:13:53 +00:00
Tim Murray
8197cc403a am 080671c5: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit '080671c5383f4b98303c143a685b9f5e75cfe781':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-16 17:01:29 +00:00
Tim Murray
080671c538 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-16 09:55:50 -07:00
Tenghui Zhu
386caf6c8f Merge "update parameters in uploadToTexture() for GLES20" 2014-06-16 15:49:03 +00:00
Robert Ly
208eb3e84a Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev 2014-06-16 15:46:16 +00:00
Joe Fernandez
38ed6b7b77 Android TV DevGuide home fix (no pic) 
Change-Id: If48d6c6d2973c2d4bcf97da503cb707144f33028
 2014-06-16 16:05:43 -07:00
Robert Ly
13bc25bf4c Merge "docs: misc l-prev fixes" into klp-modular-dev 2014-06-16 15:46:16 +00:00
Robert Ly
d82b45c1a4 docs: misc l-prev fixes 
Change-Id: I9e2e82d926ba81c8621b24aa10247e1231bb2b2d
 2014-06-16 15:26:20 -07:00
Colin Cross
cb634bda7b Merge "clean up native com.android.internal.os.Zygote" 2014-06-16 15:34:52 +00:00
Michael Kolb
a730881d76 Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev 2014-06-16 15:34:28 +00:00
Michael Kolb
ee028d502e DO NOT MERGE : Fix measuring with outset for orientation 
Bug: 14992865

Change-Id: Ie133d8010a394403e52512f4012632389bc32c4a
 2014-06-16 20:28:52 +00:00
Narayan Kamath
5406f59abd am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd." 
* commit '6a6411e3d8c533a40bfe1897e2c26e3d6f3b52e0':
  Move dex file pruning to installd.
 2014-06-16 13:54:10 +00:00
Narayan Kamath
6a6411e3d8 am 076dc013: Merge "Move dex file pruning to installd." 
* commit '076dc0135b153cbcedbe584645c93cfe4390cdb0':
  Move dex file pruning to installd.
 2014-06-16 13:50:37 +00:00
Narayan Kamath
2ecc4dc88f am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit 'f36fe3f85daaf9e3b3270143d6648394768bb324':
  Track changes to libcore ICU apis.
 2014-06-16 11:01:29 +00:00
Narayan Kamath
f36fe3f85d am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit '1083573c2feb6677ae5627a9ee41f82a697e22d4':
  Track changes to libcore ICU apis.
 2014-06-16 10:56:34 +00:00
Robert Ly
2b49f5b5fa am d3843038: Merge "docs: Fixing the remaining issues with the Auto page" into klp-modular-dev 
* commit 'd3843038b93e91681a6f40633efeca8b41edc055':
  docs: Fixing the remaining issues with the Auto page
 2014-06-16 10:07:04 +00:00
Joe Fernandez
05b55afff4 am b83765ff: Android TV Dev Guide for L-Prevew, round 2 
* commit 'b83765ff06afbc96f4ffc21f9350ef6650d70d94':
  Android TV Dev Guide for L-Prevew, round 2
 2014-06-16 10:06:57 +00:00
Narayan Kamath
5a44bdc828 am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code." 
* commit '8382b0d3c6639ee0eeadec02983bfceaf5ba0a32':
  Remove some pointless code.
 2014-06-16 09:54:49 +00:00
Narayan Kamath
8382b0d3c6 am ab9a19e3: Merge "Remove some pointless code." 
* commit 'ab9a19e38c685d0cb2952185af510322b26181a7':
  Remove some pointless code.
 2014-06-16 09:47:10 +00:00
Narayan Kamath
8966fd383b am 031dec4a: am bfa6ddd0: Merge "Support deprecated language codes." 
* commit '031dec4acd384ae6c5ab183139c7f91289a05f62':
  Support deprecated language codes.
 2014-06-16 09:44:03 +00:00
Narayan Kamath
031dec4acd am bfa6ddd0: Merge "Support deprecated language codes." 
* commit 'bfa6ddd02d699f43915cba8027ab324d234b4836':
  Support deprecated language codes.
 2014-06-16 09:39:57 +00:00
sean_lu
7c57d23371 [Asset Manager] Fix memory leakage bug 
Symptom: memory leakage
Root Cause: new SortedVector but not free it in native cpp
Solution: free the SortedVector
Project: AOSP
Note:

Change-Id: Iab5a7f2e8d8509631301e7231427927d4797c856
 2014-06-16 15:11:29 +08:00
Joe Fernandez
b83765ff06 Android TV Dev Guide for L-Prevew, round 2 
Change-Id: I461a0fd34a695aaefe1211e079069ea0cf03eb2d
 2014-06-15 23:01:18 -07:00