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

95378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
ed9cc555ee Reconcile with jb-mr1-release - do not merge 2013-02-26 14:03:20 -08:00
Ian Rogers
fe067a4cc5 Deprecate and document memory allocation counting. 
Bug: 8241521
Change-Id: I174c4024600c5b78e74030ecc99e784a98295f09
 2013-02-26 13:30:08 -08:00
Dirk Dougherty
0db6a9e9a6 am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'a18ff6f1ae45c4553e7d2e0c65a5b347bbb370e4':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:47:54 -08:00
Dirk Dougherty
a18ff6f1ae am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'f809e96fef4df25899c267e1cac648e08ba31a72':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:44:56 -08:00
Dirk Dougherty
f809e96fef am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '1a15b24bdd6a42b1c0c36e06c58d408af6eb276b':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:42:45 -08:00
Dirk Dougherty
1a15b24bdd am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '012ef92e0358360a6d5109fddc9e58e16b13c80d':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:40:24 -08:00
Dirk Dougherty
012ef92e03 Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 2013-02-26 18:36:11 +00:00
Elliott Hughes
c22657f8b1 am 3f5778c8: Merge "Fix incorrect FloatMath documentation." 
* commit '3f5778c858b90b554d7614603346b642d1a7bc6d':
  Fix incorrect FloatMath documentation.
 2013-02-26 10:02:45 -08:00
Kenny Root
f7497c9e55 am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 
* commit '755205ade42d6458c68bf1ee6852db0b23ecc4f5':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
 2013-02-26 10:02:43 -08:00
Scott Main
1649f818e2 docs: add MTK usb driver info 
Change-Id: I847877e65207d065883e7ab74be65b6333ca205d
 2013-02-26 09:45:13 -08:00
Elliott Hughes
3f5778c858 Merge "Fix incorrect FloatMath documentation." 2013-02-26 17:37:58 +00:00
Kenny Root
755205ade4 Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 2013-02-26 17:35:13 +00:00
Elliott Hughes
f732a2f83f Fix incorrect FloatMath documentation. 
Change-Id: I30bbe500e634b73f3456ccc797106ad261fd0ce7
 2013-02-26 09:28:17 -08:00
Martin Olsson
64d0b3f918 Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help" 
Change-Id: I8f869c9d2243ae8ff414399b7d6835c7ca74d500
Signed-off-by: Martin Olsson <martin@minimum.se>
 2013-02-26 17:54:39 +01:00
Robert Ly
a1ee7539ff am c6793135: am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit 'c679313559e90f0c35f15e1b5070c277ada981d3':
  docs: remove games references
 2013-02-26 08:07:45 -08:00
Robert Ly
c679313559 am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit '1d13e85031eff239e035afb1ff474502caf01104':
  docs: remove games references
 2013-02-26 08:04:45 -08:00
Robert Ly
1d13e85031 am 928f6382: am af7b843e: docs: remove games references 
* commit '928f6382eb4ac0b6ea3f5141ba297412e26d8fe6':
  docs: remove games references
 2013-02-26 08:02:43 -08:00
Robert Ly
928f6382eb am af7b843e: docs: remove games references 
* commit 'af7b843e97d5228bf8cc57aa37acf6c7d58464e8':
  docs: remove games references
 2013-02-26 08:00:38 -08:00
Robert Ly
af7b843e97 docs: remove games references 
Change-Id: I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 07:49:56 -08:00
Robert Ly
c1da3af593 am 9e49d2af: am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '9e49d2af7289ff7f7c96568f6c41cb22295e4613':
  docs: gms cheddar updates for g+
 2013-02-25 22:09:25 -08:00
Robert Ly
9e49d2af72 am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '045bede816c6578379911567f68046393f70247c':
  docs: gms cheddar updates for g+
 2013-02-25 22:08:19 -08:00
Robert Ly
045bede816 am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '4240da1a888edca033ca10b6995ea9c7df5c7e5b':
  docs: gms cheddar updates for g+
 2013-02-25 22:07:03 -08:00
Robert Ly
4240da1a88 am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '7cbf2bc6810ca4623d990258823d25e307ebbfd7':
  docs: gms cheddar updates for g+
 2013-02-25 22:03:41 -08:00
Robert Ly
7cbf2bc681 Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 2013-02-26 05:59:50 +00:00
Robert Ly
32c0cacf14 docs: gms cheddar updates for g+ 
Change-Id: I7ffd94fa17f0911f83e0c40462861a9e6080a197
 2013-02-25 20:44:05 -08:00
Robert Ly
998cb7d3f0 am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit 'ce861ff3497c28bbddc40ee2232927c2fa3ab489':
  docs: gms and gcm javadocs
 2013-02-25 17:58:23 -08:00
Robert Ly
ce861ff349 am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit 'd470874be53add0ec46436682b4da46768b82497':
  docs: gms and gcm javadocs
 2013-02-25 17:56:06 -08:00
Robert Ly
d470874be5 am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit 'ee46979bde5f59fbeccd01e62fb572c66577e21f':
  docs: gms and gcm javadocs
 2013-02-25 17:54:32 -08:00
Robert Ly
ee46979bde am 05c8e63c: docs: gms and gcm javadocs 
* commit '05c8e63c760eabfbd1cb19d996038c280472c357':
  docs: gms and gcm javadocs
 2013-02-25 17:52:13 -08:00
Robert Ly
05c8e63c76 docs: gms and gcm javadocs 
Change-Id: I59c11622ee90ec1ce527711afed55818f5818d3f
 2013-02-25 15:31:22 -08:00
Elliott Hughes
70347e8352 am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation." 
* commit '8d4d4cf283d12821caba321204759f2ce3fd210a':
  Remove obsolete traceview file format documentation.
 2013-02-25 15:30:58 -08:00
Elliott Hughes
8d4d4cf283 Merge "Remove obsolete traceview file format documentation." 2013-02-25 22:50:51 +00:00
Joe Malin
0c7d1abaae am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit 'b8df147c59381cc66b5acd3718aa3fc1eaa851b6':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:37:15 -08:00
Joe Malin
b8df147c59 am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit '5c8bba358634b20b47a87dcdb65d01988258cc53':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:36:02 -08:00
Joe Malin
5c8bba3586 am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit 'cfb153b146b7d1627bdc02e2dc24becb2da5b12b':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:34:46 -08:00
Joe Malin
cfb153b146 am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit '06764394eb9e4ba4e5f87c816827d82c93b5e71c':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:32:22 -08:00
Joe Malin
06764394eb Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 2013-02-25 19:29:06 +00:00
Scott Main
c4bed52910 am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit '93b4fcf44bc9ff3ea3359382fb4ba4e2da6a73c8':
  docs: add google io registration announcement to home page
 2013-02-25 10:44:16 -08:00
Scott Main
93b4fcf44b am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit 'f714e0781e30a5cb68326ff2381af3999e0a3e0d':
  docs: add google io registration announcement to home page
 2013-02-25 10:42:41 -08:00
Scott Main
f714e0781e am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit 'b38066bb22e0e71c6e03697d2b3fc18050ff4c76':
  docs: add google io registration announcement to home page
 2013-02-25 10:41:41 -08:00
Scott Main
b38066bb22 am d51eebae: docs: add google io registration announcement to home page 
* commit 'd51eebae6d5d798e5af2ec49f77d4b5fcf1678b7':
  docs: add google io registration announcement to home page
 2013-02-25 10:40:34 -08:00
Scott Main
d51eebae6d docs: add google io registration announcement to home page 
Change-Id: I638e9b720f027cd08b5a46f91339597fe954cb42
 2013-02-25 10:36:03 -08:00
Joe Fernandez
1f954f2fee am d5f87129: am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit 'd5f87129757814e7fa83739afb921fe42d9e7454':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 10:22:43 -08:00
Joe Malin
43f81181bc Bug 8261430: Typo in Notifications 
Change-Id: Ia0de6eec870f75cb31e082fba5a8b6764d6e4810
 2013-02-25 10:20:29 -08:00
Joe Fernandez
d5f8712975 am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit '2ca291b82106b998d544c47454dc595a2430864d':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 10:19:59 -08:00
Joe Fernandez
2ca291b821 am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit '9faf06644da1dc893d74f15ddd69a2e4201b6e07':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 10:14:57 -08:00
Joe Fernandez
9faf06644d Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 2013-02-25 18:10:54 +00:00
Ian Rogers
92f3e9a1fb am e88c0d9e: Merge "Recognize odex files in memory accounting." 
* commit 'e88c0d9ec374ec4dcca6ccd8d440610ea83622c9':
  Recognize odex files in memory accounting.
 2013-02-25 10:04:53 -08:00
Ian Rogers
e88c0d9ec3 Merge "Recognize odex files in memory accounting." 2013-02-25 17:13:24 +00:00
Amit Kumar
fe6c30e44e FIX Null Pointer Exception on dialog cancel 
Null Pointer Exception occurs because mWebViewCore instance
is made to null while calling destroyJava(). When 
1.webview hosting activity goest to background, without calling webview onPause().
2. If app is launched again (having launchmode:singletask ) and another activity (not  webview hosting) comes on top top.
3. It destorys the previous activity holding webview which internally tries to cancel the dialog, but webviewcore instance is null. 
Null pointer exception is raised.

Change-Id: Idbcd30d0b0d4a35819444bbaa5c73cced8bb35a3
Signed-off-by: Amit Kumar <amitkecian@gmail.com>
 2013-02-24 09:20:26 +00:00