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

119156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
e05b7b50e2 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 2014-01-31 01:26:15 +00:00
Scott Main
53959634b3 am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit '40a7e3c425120661c305999f7c2bdd76d3240b7d':
  Revert "add Cast to the sidenav"
 2014-01-30 23:25:08 +00:00
Scott Main
a749593dd6 am 04022e50: am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit '04022e50774c02ff0a7757c5464486af021fd108':
  Revert "add google cast feature page"
 2014-01-30 23:25:02 +00:00
Quddus Chong
7ce575a525 am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 
* commit 'bcf8faa6c79bde5b9580057238e447165ac9d329':
  Revert "docs: Added API reference docs for GCore Iberico release."
 2014-01-30 23:24:54 +00:00
Zhijun He
5901ddeb52 am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" 
* commit '0a1b64fe79f41eec5cebe8434ab30d93e2ea2724':
  Release locked buffer when it fails to acquire graphics buffer
 2014-01-30 15:03:30 -08:00
Zhijun He
0a1b64fe79 Merge "Release locked buffer when it fails to acquire graphics buffer" 2014-01-30 23:01:21 +00:00
Hui Lu
3cab7fc1b8 Merge "Add proxy as another network." into klp-modular-dev 2014-01-30 22:58:48 +00:00
Hui Lu
1c5624a012 Add proxy as another network. 
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
 2014-01-30 17:26:18 -05:00
Brian Carlstrom
2cd0563cb8 am 3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '3038046b23540ccf4ca80f181386a77cf64d5e27':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-30 14:11:02 -08:00
Scott Main
40a7e3c425 am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit 'e71cc6fd82df1bf654d72e796ac7975dbf0aff29':
  Revert "add Cast to the sidenav"
 2014-01-30 22:10:50 +00:00
Scott Main
04022e5077 am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit '4b1a317abb56dc90efacf86ccd796643b1f02478':
  Revert "add google cast feature page"
 2014-01-30 22:10:45 +00:00
Scott Main
e71cc6fd82 am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit '897739f1b7d179cd402fcf907e2ac9751fe44c6d':
  Revert "add Cast to the sidenav"
 2014-01-30 21:52:15 +00:00
Scott Main
4b1a317abb am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit '428ccea5090d3a88d6af898cd90b52df4062101f':
  Revert "add google cast feature page"
 2014-01-30 21:52:11 +00:00
Brian Carlstrom
3038046b23 Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-30 21:50:58 +00:00
Scott Main
897739f1b7 Merge "Revert "add Cast to the sidenav"" into klp-docs 2014-01-30 21:27:26 +00:00
Scott Main
1ff3e4fffc Revert "add Cast to the sidenav" 
This reverts commit 3781318fefba28699e7713b231c9591bf29eadac.

Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d
 2014-01-30 21:27:06 +00:00
Scott Main
428ccea509 Merge "Revert "add google cast feature page"" into klp-docs 2014-01-30 21:24:45 +00:00
Scott Main
eae9f4675e Revert "add google cast feature page" 
This reverts commit cf010ab9c5df8896c57a722137ac3b4306ef1ca5.

Change-Id: I87197ce3c4f65ae8899bbf081cb4c0e84e4f1684
 2014-01-30 21:24:25 +00:00
Brian Carlstrom
c6c633608a frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default 
Bug: 12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
 2014-01-30 13:16:48 -08:00
Quddus Chong
bcf8faa6c7 am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 
* commit 'f29e2589a440e73d9dea1a6c9c7aed1c5a3002f2':
  Revert "docs: Added API reference docs for GCore Iberico release."
 2014-01-30 19:36:07 +00:00
Quddus Chong
f29e2589a4 am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 
* commit '583e0b2c0e1011406342a0801045a893b75880ca':
  Revert "docs: Added API reference docs for GCore Iberico release."
 2014-01-30 19:33:24 +00:00
Quddus Chong
583e0b2c0e Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 2014-01-30 19:31:05 +00:00
Quddus Chong
0c8b53a25b Revert "docs: Added API reference docs for GCore Iberico release." 
This reverts commit 32993c68fff5cb229c8503ffe0fad06b53189377.

Change-Id: I8eab48ae260a3289ae0d4c0a131d80a1fd1a5316
 2014-01-30 19:03:16 +00:00
Scott Main
84dabc75da am 500db2fe: am 55330921: am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2 
* commit '500db2fed926e50f6fdb60ccb010724143960dd9':
  update android studio download to 0.4.2
 2014-01-30 18:12:46 +00:00
Scott Main
500db2fed9 am 55330921: am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2 
* commit '55330921c93f3ed6f277fed4d98a2133dd3ab47a':
  update android studio download to 0.4.2
 2014-01-30 18:09:16 +00:00
Scott Main
55330921c9 am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2 
* commit '8b6fa56f5cdb66ed1bafb7920ba8299ee8b3034a':
  update android studio download to 0.4.2
 2014-01-30 18:06:44 +00:00
Scott Main
8b6fa56f5c am c1ae12b7: update android studio download to 0.4.2 
* commit 'c1ae12b7d891ff3598d03f52a0e817876d7921e3':
  update android studio download to 0.4.2
 2014-01-30 18:03:05 +00:00
Scott Main
c1ae12b7d8 update android studio download to 0.4.2 
Change-Id: Icf789bb6a2cfb254b25e865e2a60ec4717887afa
 2014-01-30 09:02:25 -08:00
Scott Main
959c5d5ef9 am ec20f347: am 46cf9087: am e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs 
* commit 'ec20f347e71f6ca35cd88b747a9b0ba2a81744cd':
  Revert "add warning to all the new iberico API pages about SDK not available yet"
 2014-01-30 16:51:09 +00:00
Scott Main
fb6f1e3901 am 599bb934: am 759c6305: am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs 
* commit '599bb93400d719d2570f8d84bdbc63c9ed4f85d0':
  Revert "add api notice to cast package index"
 2014-01-30 16:47:16 +00:00
Scott Main
ec20f347e7 am 46cf9087: am e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs 
* commit '46cf90878e49f15a94db28366da581e9f11c9a4c':
  Revert "add warning to all the new iberico API pages about SDK not available yet"
 2014-01-30 16:46:59 +00:00
Scott Main
cbc8a872cc am 648729ad: am 540306be: am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 
* commit '648729adb4c75199d6464c32cf9eb26cffacb680':
  Revert "add api notice to a bunch more files in iberico release"
 2014-01-30 16:43:13 +00:00
Scott Main
599bb93400 am 759c6305: am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs 
* commit '759c6305b227fbb22a031b9ac561f8f23ca41a0f':
  Revert "add api notice to cast package index"
 2014-01-30 16:43:07 +00:00
Scott Main
46cf90878e am e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs 
* commit 'e49346dcb213cc96f910c798e4aa00688197af9a':
  Revert "add warning to all the new iberico API pages about SDK not available yet"
 2014-01-30 16:42:44 +00:00
Scott Main
648729adb4 am 540306be: am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 
* commit '540306be15f9d15a93ef05db870653d5a5e7bc38':
  Revert "add api notice to a bunch more files in iberico release"
 2014-01-30 16:38:54 +00:00
Scott Main
759c6305b2 am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs 
* commit '0d9f5b640c31a5bce699419a93a98acef1471db7':
  Revert "add api notice to cast package index"
 2014-01-30 16:38:46 +00:00
Scott Main
e49346dcb2 am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs 
* commit 'eb35de00dec9444e0c46ac641a74d058be48d547':
  Revert "add warning to all the new iberico API pages about SDK not available yet"
 2014-01-30 16:38:33 +00:00
Scott Main
540306be15 am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 
* commit 'eee015057a2abfaef2ac7360a5536605e7d74e05':
  Revert "add api notice to a bunch more files in iberico release"
 2014-01-30 16:34:52 +00:00
Scott Main
eb35de00de Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs 2014-01-30 16:34:26 +00:00
Scott Main
0d9f5b640c am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs 
* commit 'e627eaeebe061e3fc586a78c8837d1b780d0741b':
  Revert "add api notice to cast package index"
 2014-01-30 16:34:26 +00:00
Scott Main
5a6c979c80 Revert "add warning to all the new iberico API pages about SDK not available yet" 
This reverts commit e724990230d267c13f8f820b5fdbe7c58b25d344.

Change-Id: I1415bf9542b01b57b1802115466288ec93ab6987
 2014-01-30 16:33:50 +00:00
Scott Main
e627eaeebe Merge "Revert "add api notice to cast package index"" into klp-docs 2014-01-30 16:31:44 +00:00
Scott Main
eee015057a am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 
* commit '36d7dfb7e816836dbc6039237cadd3382e10d5b2':
  Revert "add api notice to a bunch more files in iberico release"
 2014-01-30 16:30:26 +00:00
Scott Main
f6617d0fa7 Revert "add api notice to cast package index" 
This reverts commit 845bcc6d344765a0ea7cfcf0b4ac398774d06f94.

Change-Id: I07b047f1b44e8b9b32bb4b36b6f858cdef9fed9e
 2014-01-30 16:28:27 +00:00
Scott Main
36d7dfb7e8 Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 2014-01-30 16:26:21 +00:00
Scott Main
df2cb1e521 Revert "add api notice to a bunch more files in iberico release" 
This reverts commit c62223a04d15da4240129a9b05ad0be965f08ee4.

Change-Id: If3cee4062e2f48a3c1e365f025701e6d1de9c9d4
 2014-01-30 16:25:38 +00:00
jl1990
3cd12a5155 Fixed cancel() not working correctly 
The method handleMessage(Message msg) from mHandler variable was
not checking if the timer was cancelled, so
sendMessageDelayed(obtainMessage(MSG), delay) was keeping the
timer alive. The patch simply adds a boolean and checks if the
CountDownTimer was cancelled before calling
sendMessageDelayed(obtainMessage(MSG), delay)

bug: https://code.google.com/p/android/issues/detail?id=58668

Change-Id: Ic6bbb9d33a3616f8503db222513cc14ad2270cb8
Signed-off-by: jl1990 <jlcarrasco1990@gmail.com>
 2014-01-30 13:46:44 +00:00
Narayan Kamath
70986e197b am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 
* commit 'ab71f8b68fee0f2a4f2049c4345b5334948c9df9':
  AArch64: Use of long for pointers in PropertyValuesHolder
 2014-01-30 02:39:21 -08:00
Narayan Kamath
ab71f8b68f Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 2014-01-30 10:37:12 +00:00
Narayan Kamath
fa2e16e36d am 54190ec8: Merge "change Surface constructor arg to 64bit" 
* commit '54190ec8307ebb83d02b7d9b8edc80a042792de6':
  change Surface constructor arg to 64bit
 2014-01-30 02:34:38 -08:00