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

120492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Michael Jurka
c82618c660 [DO NOT MERGE] Fix wallpaper cropping bugs 
- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size
- switch to using asynctask when setting wallpaper
dimensions
(cherry picked from commit e39c9a953ca11319b747b3aa79f4ccd082b775b7)

Change-Id: I43372f0bff37f139c8bc83f9956a967d0b4a8708
 2014-03-19 17:56:55 +00:00
Robert Craig
4385343fd8 Allow PMS to restorecon directories under /data. 
This change applies a relabel to both /data/data and
/data/user directories on boot. Not every boot will
apply this relabeling however. The appropriate
seapp_contexts is hashed and compared to
/data/system/seapp_hash to decide if the relabel
should occur.

Change-Id: I05e8b438950ddb908e46c9168ea6ee601e6d674f
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-03-19 17:37:37 +00:00
Robert Greenwalt
bd84f01c6c am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev 
* commit '5d3d4ee3005e910dce780074d3f68d594aa12070':
  Handle provisioning APN by turning off/on data.
 2014-03-19 16:15:22 +00:00
Robert Greenwalt
5d3d4ee300 Merge "Handle provisioning APN by turning off/on data." into klp-dev 2014-03-19 16:12:01 +00:00
Dan Sandler
48b3f56cd8 Merge commit '95a7829c' into manualmerge 2014-03-19 12:02:51 -04:00
Dan Sandler
95a7829c27 am b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev 
* commit 'b78dc69c2be43852dcd7150db2b545f9b4110232':
  DO NOT MERGE: Maintain binding to crashed listeners.
 2014-03-19 13:08:53 +00:00
Dan Sandler
b78dc69c2b Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev 2014-03-19 13:04:01 +00:00
Narayan Kamath
58f9a645e1 PacProcessor should be 32 bit only. 
It depends on external/v8, which isn't ready for 64 bit yet.

Change-Id: Ibc9705665b81d3667826dedd6217f2eb6d451c81
 2014-03-19 11:39:43 +00:00
Dave Platt
28e9f76dce am c76bccd6: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit 'c76bccd6ea993eb6e71baff9f5ed2f9fe67af947':
  Harden NsdManager against null-dereference crashes
 2014-03-19 01:07:46 +00:00
Jeff Brown
322dc212b7 am 1eac8391: am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit '1eac839165b05d4998ca344a25594b0a1cfae042':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 01:00:06 +00:00
Dave Platt
c76bccd6ea am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit '17e7c4076b8f1617ed397dae570e9d5240cd9c1b':
  Harden NsdManager against null-dereference crashes
 2014-03-19 00:59:47 +00:00
Jeff Brown
aba566589e Fix inverted conditional in View.setFilterTouchesWhenObscured. 
Bug: 13530806
Change-Id: Icdaf909c355f5b22635e1060f2190502916b144f
 2014-03-18 17:59:21 -07:00
Jeff Brown
1eac839165 am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit 'c9a7eeba15641da5a5bc8499e813e6c2211506ff':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 00:55:39 +00:00
Dave Platt
17e7c4076b am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev 
* commit '98a027a506b5acff1a7ab0cc3655399da7d025c7':
  Harden NsdManager against null-dereference crashes
 2014-03-19 00:54:54 +00:00
Dave Platt
98a027a506 Merge "Harden NsdManager against null-dereference crashes" into klp-dev 2014-03-19 00:50:30 +00:00
Jeff Brown
c9a7eeba15 am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 
* commit '4cb1bc2877f8562e6d349a6c737a3055ef4eaa29':
  Refresh cast icon assets to improve visual contrast.
 2014-03-19 00:25:41 +00:00
Jeff Brown
4cb1bc2877 Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 2014-03-19 00:19:38 +00:00
Xia Wang
454fc6b118 am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev 
* commit '560e75417252b502a41967aa4d819a029361e384':
  Fix state transition verification.
 2014-03-18 22:34:17 +00:00
Xia Wang
560e754172 am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev 
* commit '1b007565c73097728496f3dbe811a51c879ba89e':
  Fix state transition verification.
 2014-03-18 22:22:37 +00:00