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

126095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
c8868db2a0 am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '737d3e5da366124d164555009fa5ee4552143cc8':
  malloc some advances
 2014-03-19 15:03:28 -07:00
Craig Mautner
5b39f63c24 am 9957c322: am c60ac2b8: am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '9957c322db8864117d375e157bccaf6033b45646':
  Fix loop limits.
 2014-03-19 22:01:32 +00:00
John Spurlock
07cf4da1d0 Merge "Add stream-level suppression to vibrate/audio services." 2014-03-19 21:58:19 +00:00
Victoria Lease
737d3e5da3 am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
  malloc some advances
 2014-03-19 14:57:36 -07:00
Craig Mautner
9957c322db am c60ac2b8: am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit 'c60ac2b825459165b7e708fc2049d04d6f5c3fb2':
  Fix loop limits.
 2014-03-19 21:56:21 +00:00
Victoria Lease
6b96ecca90 am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '32753f4f1c0dfd810d68759cce3e51cf788084f8':
  malloc some advances
 2014-03-19 14:51:58 -07:00
Craig Mautner
c60ac2b825 am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '924927d322b2aeb13cbd654b10807b9151a0822c':
  Fix loop limits.
 2014-03-19 21:51:51 +00:00
Victoria Lease
32753f4f1c am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '3191212259b1629cf8174416adf01522b88501ad':
  malloc some advances
 2014-03-19 14:47:23 -07:00
Chris Craik
8ee13de681 Merge "Update unsupported op tables for API 19, and for extensibility" 2014-03-19 21:46:17 +00:00
Craig Mautner
924927d322 am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '1888333d7e814d6681a327cf1f3eda10098e3620':
  Fix loop limits.
 2014-03-19 21:46:00 +00:00
Craig Mautner
1888333d7e am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit 'd4375b4713658c06001e9dba7105804c872fc199':
  Fix loop limits.
 2014-03-19 21:41:43 +00:00
Victoria Lease
3191212259 am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
  malloc some advances
 2014-03-19 14:40:17 -07:00
Craig Mautner
d4375b4713 Merge "Fix loop limits." into klp-dev 2014-03-19 21:37:07 +00:00
Victoria Lease
6eb2810318 am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances
 2014-03-19 14:32:15 -07:00
Etan Cohen
4a6f087950 Merge "Catch Netd exceptions to avoid runtime restart" 2014-03-19 21:30:15 +00:00
Wei Wang
ffbea5c7da Merge "Add status callback for start/stop advertising. Fixes b/13289050, b/13418851, also fixes 13418671." 2014-03-19 21:29:59 +00:00
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances 
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
 2014-03-19 14:27:19 -07:00
Robert Greenwalt
d9cb2f3d06 Catch Netd exceptions to avoid runtime restart 
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
 2014-03-19 14:26:28 -07:00
Glenn Kasten
29427a224e am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a0e300efae92d8155151e345034620054cff8955':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:22:09 +00:00
Glenn Kasten
5341f881e0 am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit '4f346bf0ffe1c596ca261dfec23c50977de77d82':
  Fix 64 bit compile failures in renderscript
 2014-03-19 21:22:06 +00:00
Glenn Kasten
a0e300efae am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit '458edc8de368607a1cf831f7e8bb70047c8bf905':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:15:41 +00:00
Glenn Kasten
4f346bf0ff am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit 'ff1e1d99ea029197051b3cdaa39effc6baa94b53':
  Fix 64 bit compile failures in renderscript
 2014-03-19 21:15:38 +00:00
Glenn Kasten
458edc8de3 am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:10:41 +00:00
Glenn Kasten
ff1e1d99ea am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit '240d56386377f3bcd554a2cc07e0c3e336103c86':
  Fix 64 bit compile failures in renderscript
 2014-03-19 21:10:36 +00:00
Craig Mautner
b4998eec3c Fix loop limits. 
Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
 2014-03-19 14:09:59 -07:00
Lajos Molnar
13403eabb6 am 53ee9ecd: am e37e9929: am e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 
* commit '53ee9ecd9dcfba58ce700d57dcc648700dc52528':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
 2014-03-19 21:07:11 +00:00
Glenn Kasten
a3dc076d2d am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'bfc440923ecb8f32448c675095a2096049fe7ebe':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 14:05:23 -07:00
Glenn Kasten
240d563863 am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46':
  Fix 64 bit compile failures in renderscript
 2014-03-19 14:05:20 -07:00
Lajos Molnar
53ee9ecd9d am e37e9929: am e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 
* commit 'e37e99290e47bf69ca8a61f795e840bc2c831d75':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
 2014-03-19 21:02:52 +00:00
Glenn Kasten
bfc440923e Merge "mediaeditor shouldn't depend on audioflinger." 2014-03-19 21:02:39 +00:00
Glenn Kasten
c1f3d4c1ba Merge "Fix 64 bit compile failures in renderscript" 2014-03-19 21:01:57 +00:00
Lajos Molnar
e37e99290e am e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 
* commit 'e128ca437a668e4050f6b81187d5a9c507c5725e':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
 2014-03-19 20:57:15 +00:00
Chris Craik
0b648e6ac3 Update unsupported op tables for API 19, and for extensibility 
Change-Id: I00608d1ddbe919ee49d981809fd086da455d6a0a
 2014-03-19 13:52:23 -07:00
Lajos Molnar
e128ca437a am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 
* commit '0dc084865313a416246915c72b29c13cc3f404d4':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
 2014-03-19 20:52:03 +00:00
Lajos Molnar
0dc0848653 am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 
* commit 'f7b33e8656599ed3e0edd834a03a0366b0f655bb':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
 2014-03-19 20:46:48 +00:00
Lajos Molnar
f7b33e8656 Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 2014-03-19 20:43:23 +00:00
Adam Cohen
ffdff7f4d7 am 2f8bc12f: (-s ours) am 14c1fb4d: am 5b137544: am 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev 
* commit '2f8bc12f1529e72535f0a5474d52abae3aaf479d':
  [DO NOT MERGE] Fix wallpaper cropping bugs
 2014-03-19 20:41:50 +00:00
Adam Cohen
013dd468ea am 10ef7b9c: (-s ours) am e4498ce4: am 55d9907d: am cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev 
* commit '10ef7b9cb29fa5d6151415bdbff1dd1afae5dde7':
  [DO NOT MERGE] Centering the crop by default in system wallpaper cropper
 2014-03-19 20:41:46 +00:00
Adam Cohen
2f8bc12f15 am 14c1fb4d: am 5b137544: am 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev 
* commit '14c1fb4d1b2baad0780f2c263781b068c370b0dc':
  [DO NOT MERGE] Fix wallpaper cropping bugs
 2014-03-19 20:37:07 +00:00
Adam Cohen
10ef7b9cb2 am e4498ce4: am 55d9907d: am cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev 
* commit 'e4498ce4b7e113469b8c0e2761a2b78e7748fa57':
  [DO NOT MERGE] Centering the crop by default in system wallpaper cropper
 2014-03-19 20:37:04 +00:00
Nick Kralevich
70b7d163aa am 31654e19: am b630ffe3: am e75d340a: am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data." 
* commit '31654e19c92c94675c0e2f2a86b59683d4c48d2f':
  Allow PMS to restorecon directories under /data.
 2014-03-19 20:34:32 +00:00
Adam Cohen
14c1fb4d1b am 5b137544: am 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev 
* commit '5b1375445afef5ce0cbceaa69fc44667e3e358fb':
  [DO NOT MERGE] Fix wallpaper cropping bugs
 2014-03-19 20:30:25 +00:00
Adam Cohen
e4498ce4b7 am 55d9907d: am cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev 
* commit '55d9907d595d5938dba52298fe82693b1799687b':
  [DO NOT MERGE] Centering the crop by default in system wallpaper cropper
 2014-03-19 20:30:21 +00:00
Nick Kralevich
31654e19c9 am b630ffe3: am e75d340a: am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data." 
* commit 'b630ffe3fdd72be186495f2c0a8d05b936a73d46':
  Allow PMS to restorecon directories under /data.
 2014-03-19 20:29:43 +00:00
Jeff Brown
c768e1b673 am 3e1b03e4: am 5693d403: am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '3e1b03e4e73d46a752537e6dcec9abdf6f5116a6':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:28:03 +00:00
Nick Kralevich
b630ffe3fd am e75d340a: am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data." 
* commit 'e75d340ae5919942d19f57856ae9e3f8bc62e098':
  Allow PMS to restorecon directories under /data.
 2014-03-19 20:24:32 +00:00
Adam Cohen
5b1375445a am 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev 
* commit '0dca4fc929638755454cc46a4eb21e86b3fcb0c8':
  [DO NOT MERGE] Fix wallpaper cropping bugs
 2014-03-19 20:24:02 +00:00
Adam Cohen
55d9907d59 am cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev 
* commit 'cc8fbb5999687e9413a9b0a8576c21116fc558db':
  [DO NOT MERGE] Centering the crop by default in system wallpaper cropper
 2014-03-19 20:23:59 +00:00
Jeff Brown
3e1b03e4e7 am 5693d403: am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '5693d403600b430acb995573d1648f6a551ed510':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:21:29 +00:00
Nick Kralevich
e75d340ae5 am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data." 
* commit '5c8e1a6ed4b7e12632c7c82b94e1909ae82b0706':
  Allow PMS to restorecon directories under /data.
 2014-03-19 13:20:37 -07:00