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

130032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Adam Hampson
4d693a5271 am 5951c83d: am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 
* commit '5951c83dfb38d7a3a01b5f2efc056929d20f647e':
  DO NOT MERGE Fix several bad function definitions.
 2014-04-07 21:46:53 +00:00
Adam Hampson
5951c83dfb am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 
* commit 'ec571bd203bb543aa1489e0c0a8bb67f5491630e':
  DO NOT MERGE Fix several bad function definitions.
 2014-04-07 21:40:00 +00:00
Adam Hampson
ec571bd203 am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 
* commit 'ce802f4898c5747038584596d9d689ca30c34c4e':
  DO NOT MERGE Fix several bad function definitions.
 2014-04-07 21:33:54 +00:00
Adam Hampson
ce802f4898 Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 2014-04-07 21:27:53 +00:00
Robert Greenwalt
df12958a11 am 124af561: am 4455c599: (-s ours) am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConf 
* commit '124af56165e7974748546ac2f243d4db8218f7b6':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 21:06:45 +00:00
Robert Greenwalt
124af56165 am 4455c599: (-s ours) am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '4455c5999f72daaf6f15c4394e413976f14337d3':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:59:05 +00:00
Robert Greenwalt
9ea2c98245 am fa306850: am f00b906f: (-s ours) am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-de 
* commit 'fa30685038de6e812fe34b9b087f8c8a0785c737':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:57:55 +00:00
Robert Greenwalt
4455c5999f am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '0468e3c7fae6945e21314ae2971c51dcb36972ee':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:52:59 +00:00
Robert Greenwalt
fa30685038 am f00b906f: (-s ours) am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'f00b906f01319a8177d2e2ab109ff01016b0bf4c':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:50:46 +00:00
Robert Greenwalt
0468e3c7fa am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:46:58 +00:00