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

130042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
27e0f545e5 am 777a8e0a: Expose APIs used to be hidden due to Doclava bug. 
* commit '777a8e0aec6d8fd4813e75a39c5611c5cb660f9f':
  Expose APIs used to be hidden due to Doclava bug.
 2014-04-08 17:59:15 +00:00
Adam Hampson
b48fb43ff8 am 1bcdaa88: am 668b1bf8: resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp 
* commit '1bcdaa88b249cdf49ba245a01108990c599e5664':
  DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-04-08 17:45:05 +00:00
Ying Wang
777a8e0aec Expose APIs used to be hidden due to Doclava bug. 
If a class inherits public fields from a hidden interface, they should
be exposed as APIs. A good example is the dozens of constants
java.util.zip.ZipFile inherits form java.util.zip.ZipConstants.

Bug: 13721174
Change-Id: I83cf13c174edf4422bc8ab2be275a47b214e1fa9
 2014-04-08 10:39:55 -07:00
Adam Hampson
1bcdaa88b2 am 668b1bf8: resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp 
* commit '668b1bf80b0e34e7079f826cd9e7358835a1e9cd':
  DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-04-08 17:38:35 +00:00
Adam Hampson
668b1bf80b resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp 
Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f
 2014-04-08 10:24:47 -07:00
Adam Hampson
bd6c5577ab Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev 2014-04-08 15:51:23 +00:00
Leon Scroggins III
67f99e3e73 am 560d1d9c: Merge "Remove SkFloatToScalar." 
* commit '560d1d9cb24498643cea26c35a1a2481b70a9e68':
  Remove SkFloatToScalar.
 2014-04-08 14:45:50 +00:00
Leon Scroggins III
560d1d9cb2 Merge "Remove SkFloatToScalar." 2014-04-08 14:39:49 +00:00
Yohei Yukawa
110553b3c9 am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 
* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
  Allow IMEs to start/stop receiving onUpdateCursor callback
 2014-04-08 06:26:09 +00:00
Yohei Yukawa
59fee2d553 Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 2014-04-08 05:48:45 +00:00
Sailesh Nepal
75c11006d2 Merge "Add InCallCall class to communicate with InCallService" into master-nova 2014-04-08 05:14:37 +00:00
Sailesh Nepal
6043793d3e Add InCallCall class to communicate with InCallService 
Change-Id: I3916e33e184f57bb6e58ed93a26b866d3ce0e7df
 2014-04-07 22:10:27 -07:00
John Reck
824b90ac95 am 1f3f55b4: Merge "Enable RT, round 2" 
* commit '1f3f55b434ce324c5fdbe74db1982fea4812a2e9':
  Enable RT, round 2
 2014-04-08 02:56:43 +00:00
John Reck
1f3f55b434 Merge "Enable RT, round 2" 2014-04-08 02:50:22 +00:00
John Reck
ed8c903a6c Enable RT, round 2 
Change-Id: I8035f477f67ede9a5cd1b4de4498bc7850c7fbf3
 2014-04-07 19:38:59 -07:00
Baligh Uddin
a2d9c7dbd0 am 086ed8f0: (-s ours) am 56868fbc: (-s ours) am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '086ed8f05577394e279b9cac6fe632654dbe5b83':
  Import translations. DO NOT MERGE
 2014-04-08 02:31:43 +00:00
Baligh Uddin
086ed8f055 am 56868fbc: (-s ours) am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '56868fbcd9b086219c4350ac34b5dfdde127c5b9':
  Import translations. DO NOT MERGE
 2014-04-08 02:24:11 +00:00
Baligh Uddin
9e861c7fac am ff17bc9c: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'ff17bc9cac2f9b178fcbfe3a0af307b4d16c2389':
  Import translations. DO NOT MERGE
 2014-04-08 02:22:52 +00:00
Baligh Uddin
2f6639ddff am d0ce581e: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'd0ce581e61af91158bf7e6f9ceecc4ab91d1369e':
  Import translations. DO NOT MERGE
 2014-04-08 02:22:49 +00:00
Baligh Uddin
56868fbcd9 am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
  Import translations. DO NOT MERGE
 2014-04-08 02:20:37 +00:00
Baligh Uddin
ff17bc9cac Merge "Import translations. DO NOT MERGE" 2014-04-08 02:16:43 +00:00
Baligh Uddin
0cf836a778 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-08 02:16:36 +00:00
Baligh Uddin
d0ce581e61 Merge "Import translations. DO NOT MERGE" 2014-04-08 02:16:33 +00:00
Alan Viverette
4d3c957b77 am a75ee14e: Update APIs to fix build 
* commit 'a75ee14e6739ddc243d0ba905f48e9c22323c9fd':
  Update APIs to fix build
 2014-04-08 02:07:27 +00:00
Alan Viverette
a75ee14e67 Update APIs to fix build 
Change-Id: Id3c0401a60ff35cd9a07ecb46fb377a00829cf90
 2014-04-07 18:59:51 -07:00
Eric Laurent
94f5ed868a am f5325314: Merge "Revert "Initial implementation of USB Audio output."" 
* commit 'f5325314ccb6809de95c9c4fa2304fe87537640a':
  Revert "Initial implementation of USB Audio output."
 2014-04-08 01:29:24 +00:00
Eric Laurent
f5325314cc Merge "Revert "Initial implementation of USB Audio output."" 2014-04-08 01:23:21 +00:00
John Reck
3ecfa8093c am e2c45526: Veto pool TODO 
* commit 'e2c455264351964bf1ae78da2256c17258f0d3ea':
  Veto pool TODO
 2014-04-08 01:09:31 +00:00
Eric Laurent
f2f80c09b6 Revert "Initial implementation of USB Audio output." 
This reverts commit 3af0fe0c9df2fc1e0a4d6bcd827a4d7aa28dbdeb
while investigating issues 13751080 and 13883978.

Bug: 13751080.
 2014-04-07 18:01:29 -07:00
John Reck
fd57f066ab am 85189c5d: Merge "Fence on draws that are reported" 
* commit '85189c5dafb08f051c7024f42ceedcbcf5dbbc7c':
  Fence on draws that are reported
 2014-04-08 00:40:00 +00:00
John Reck
e2c4552643 Veto pool TODO 
Change-Id: I50067dba630b75aa539e4406cfc15f66949684b3
 2014-04-07 17:38:47 -07:00
John Reck
85189c5daf Merge "Fence on draws that are reported" 2014-04-08 00:32:15 +00:00
Alan Viverette
59dd5be1e1 am af22ce47: Merge "Color theming for VectorDrawable, general clean up" 
* commit 'af22ce470112b8ee2ea7edf17b5d7c78e92d8ff7':
  Color theming for VectorDrawable, general clean up
 2014-04-08 00:02:48 +00:00
John Reck
28ad7b52e0 Fence on draws that are reported 
Change-Id: Ib2ec16cbda40f40df1710bdc868869ea8301f17e
 2014-04-07 16:59:25 -07:00
Alan Viverette
af22ce4701 Merge "Color theming for VectorDrawable, general clean up" 2014-04-07 23:55:29 +00:00
Alan Viverette
9453b7cfd4 Color theming for VectorDrawable, general clean up 
BUG: 13878079
Change-Id: I831d26fe3a2658161fc24e947bce382d0be6b548
 2014-04-07 16:50:46 -07:00
Narayan Kamath
c74221594d DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime. 
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

(cherry picked from commit b3802a8e2360aaa0a88faa625e15c31b56eaf125)

Bug: 13763685
Bug: 13763900

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
 2014-04-07 16:45:05 -07:00
George Mount
a7c96693fd am f7fbe099: Merge "Allow opaque windows to become translucent." 
* commit 'f7fbe099a80a6955f7c910dbae3c6fecfc0b151a':
  Allow opaque windows to become translucent.
 2014-04-07 23:34:19 +00:00
George Mount
f7fbe099a8 Merge "Allow opaque windows to become translucent." 2014-04-07 23:28:44 +00:00
John Reck
389ea9111a am 96c637e9: Merge "Refcount RenderNode" 
* commit '96c637e9414600a67c71014274e7757161dcc709':
  Refcount RenderNode
 2014-04-07 22:49:26 +00:00
John Reck
96c637e941 Merge "Refcount RenderNode" 2014-04-07 22:42:21 +00:00
Leon Scroggins III
2e0103eb34 Remove SkFloatToScalar. 
Now that SkScalar is always float (it may someday be double, but
float to double is trivial), remove callers of SkFloatToScalar,
which is deprecated in Skia.

BUG:13694396

Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
 2014-04-07 18:41:17 -04:00
Craig Mautner
1cadf745d6 am 8ea553d0: am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '8ea553d03a84e2fc3ded507dd978fca0dee22e77':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:32:26 +00:00
Deepanshu Gupta
538f44e7e7 am e9abc279: Merge "Fix theme/style resolution in Layoutlib" 
* commit 'e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b':
  Fix theme/style resolution in Layoutlib
 2014-04-07 22:32:23 +00:00
Craig Mautner
8ea553d03a am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:27:55 +00:00
Deepanshu Gupta
e9abc279fd Merge "Fix theme/style resolution in Layoutlib" 2014-04-07 22:27:01 +00:00
Craig Mautner
8f2adcb10e am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '228cefa83dd7b95e5581f619bb597808af726f80':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:21:33 +00:00
Craig Mautner
228cefa83d am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '3fb2b7132b64c65163e7c6cd948e45f703e93687':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:14:56 +00:00
Craig Mautner
3fb2b7132b Merge "[ActivityManager] Reduce report ANR on wrong activity." 2014-04-07 22:10:47 +00:00
John Reck
087bc0c14b Refcount RenderNode 
Change-Id: I7a86db8acc2b78ef33d987a43a119f5933d7d752
 2014-04-07 14:53:08 -07:00