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

119825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
ca58036dd8 am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'cfd46dc4847d5ef1ed14484717cf857ae5f67cae':
  malloc some advances
 2014-03-19 22:36:38 +00:00
Victoria Lease
cfd46dc484 am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '610d401cb580ee233c008acf8fc076047a0ffdb4':
  malloc some advances
 2014-03-19 22:32:12 +00:00
Victoria Lease
610d401cb5 am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10':
  malloc some advances
 2014-03-19 22:27:06 +00:00
Victoria Lease
e9c7fd2f2e am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '55371beb024ae402831898f8788e4293f52dd832':
  malloc some advances
 2014-03-19 15:21:09 -07:00
Victoria Lease
55371beb02 am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2':
  malloc some advances
 2014-03-19 15:14:07 -07:00
Victoria Lease
754bf6abc0 am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
  malloc some advances
 2014-03-19 15:08:32 -07:00
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
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
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
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
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
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances 
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
 2014-03-19 14:27:19 -07:00
Craig Mautner
b4998eec3c Fix loop limits. 
Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
 2014-03-19 14:09:59 -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
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
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
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
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
Lajos Molnar
0cab07d788 MediaPlayer: fix int overflow issue in MediaTimeProvider 
Bug: 13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
 2014-03-19 11:35:17 -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 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
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
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
Xia Wang
1b007565c7 am 9b650702: Merge "Fix state transition verification." into klp-dev 
* commit '9b650702113f8a17e09940c3802de71a9fc62ff1':
  Fix state transition verification.
 2014-03-18 22:16:26 +00:00
Xia Wang
9b65070211 Merge "Fix state transition verification." into klp-dev 2014-03-18 22:10:32 +00:00
Adrian Roos
2d70a47b0e am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'a4a1c0d4ee66f85376adbd71800e05b88b60c5b7':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 21:47:18 +00:00
Jeff Brown
f1e8d36327 Refresh cast icon assets to improve visual contrast. 
Bug: 13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
 2014-03-18 14:40:43 -07:00