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

120934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Adam Cohen
0dca4fc929 am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev 
* commit '55b523cc3fac7fd008094b690a0fa8c5527d569c':
  [DO NOT MERGE] Fix wallpaper cropping bugs
 2014-03-19 20:18:41 +00:00
Adam Cohen
cc8fbb5999 am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev 
* commit '8acbe8887a753c0d2e86153d00cf426781c19cf2':
  [DO NOT MERGE] Centering the crop by default in system wallpaper cropper
 2014-03-19 20:18:37 +00:00
Nick Kralevich
5c8e1a6ed4 Merge "Allow PMS to restorecon directories under /data." 2014-03-19 20:17:40 +00:00
Jeff Brown
5693d40360 am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '96abebd02559137fa320a17c5b7a985d6fc068ba':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:16:18 +00:00
Adam Cohen
55b523cc3f Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev 2014-03-19 20:16:11 +00:00
Adam Cohen
8acbe8887a Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev 2014-03-19 20:15:41 +00:00
Jeff Brown
96abebd025 am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit '80af53162477385f20956a55305d0c048ef5c1df':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:11:12 +00:00
Chris Craik
5d39a77992 Fix projection offset caching - DO NOT MERGE 
bug:13214038

Because the caching of projection matrix didn't account for changes in
the offset flag, the flag could be ignored. Now we use both to verify
that the cached matrix can be used.

Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd
(cherry picked from commit d04a6b15f74035fd2068f34225825b55e94521f4)
 2014-03-19 20:09:04 +00:00
Jeff Brown
80af531624 am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 
* commit 'f260ed09263d60ff941225e31e22d344afd90c0f':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
 2014-03-19 20:05:40 +00:00
Jeff Brown
f260ed0926 Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev 2014-03-19 20:01:42 +00:00
Mark Salyzyn
9ca25502c0 am 48250e14: am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" 
* commit '48250e141dc738578f6957f86ac841f3cb522057':
  androidfw: resolve 64-bit build issues
 2014-03-19 19:52:02 +00:00
Glenn Kasten
6afcecdc15 am 2fb4a6bb: am 48988921: am d6408735: Merge "PacProcessor should be 32 bit only." 
* commit '2fb4a6bb9eee5e99fee4fae2949f48e839d749d7':
  PacProcessor should be 32 bit only.
 2014-03-19 19:47:57 +00:00
Mark Salyzyn
48250e141d am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" 
* commit '9a09a5236529962afbaba9893e5eaf72bd6621b4':
  androidfw: resolve 64-bit build issues
 2014-03-19 19:47:02 +00:00
Glenn Kasten
2fb4a6bb9e am 48988921: am d6408735: Merge "PacProcessor should be 32 bit only." 
* commit '4898892118c00b3de7a9713d38b32c3dcaf00c91':
  PacProcessor should be 32 bit only.
 2014-03-19 19:42:43 +00:00
Mark Salyzyn
9a09a52365 am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" 
* commit '0b472ae13d38dd166a1a35782e028ade85bf2975':
  androidfw: resolve 64-bit build issues
 2014-03-19 12:42:15 -07:00
Glenn Kasten
4898892118 am d6408735: Merge "PacProcessor should be 32 bit only." 
* commit 'd6408735b9b2ca9378886a4b30e3d691c0923817':
  PacProcessor should be 32 bit only.
 2014-03-19 12:38:41 -07:00
Mark Salyzyn
0b472ae13d Merge "androidfw: resolve 64-bit build issues" 2014-03-19 19:36:52 +00:00
Glenn Kasten
d6408735b9 Merge "PacProcessor should be 32 bit only." 2014-03-19 19:34:08 +00:00
Robert Greenwalt
0bff77d6f3 am 45b1e5ec: am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '45b1e5ec053eecc4e00246eac5c4137a2aba12e0':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:17:56 +00:00
Robert Greenwalt
45b1e5ec05 am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '42b746e4d8baa6141598ddaae7148baea2ddf366':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:13:00 +00:00
Dan Sandler
6f132587a8 am e47c5a3c: am 48b3f56c: Merge commit \'95a7829c\' into manualmerge 
* commit 'e47c5a3c13a4624b10e1d3b4be0fd10f1146c942':
  DO NOT MERGE: Maintain binding to crashed listeners.
 2014-03-19 19:12:52 +00:00
Robert Greenwalt
42b746e4d8 am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
  Handle provisioning APN by turning off/on data.
 2014-03-19 19:08:44 +00:00
Dan Sandler
e47c5a3c13 am 48b3f56c: Merge commit \'95a7829c\' into manualmerge 
* commit '48b3f56cd8a3597e6ecfc5ad55d20eca182a6852':
  DO NOT MERGE: Maintain binding to crashed listeners.
 2014-03-19 19:07:41 +00:00
Lajos Molnar
0cab07d788 MediaPlayer: fix int overflow issue in MediaTimeProvider 
Bug: 13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
 2014-03-19 11:35:17 -07:00
Mark Salyzyn
00adb8685e androidfw: resolve 64-bit build issues 
- uid_t/gid_t cast to unsigned long
- unused argument warnings
- tab and space requirements

Change-Id: Ib446d8165b9082be02edb55e6b71fd1a03ea3431
 2014-03-19 11:11:14 -07:00
Michael Jurka
929e75e8d0 [DO NOT MERGE] Centering the crop by default in system wallpaper cropper 
Bug: 12034934

Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
(cherry picked from commit 2ab14daebac46307d2364733481edc3115bbf98c)
 2014-03-19 17:57:17 +00:00