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

101035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
6c8cd01ad5 am c22657f8: am 3f5778c8: Merge "Fix incorrect FloatMath documentation." 
* commit 'c22657f8b1e3b9198f1e7795a06a6f59b5cd9c80':
  Fix incorrect FloatMath documentation.
 2013-02-26 18:04:35 +00:00
Kenny Root
c2235472da am f7497c9e: am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 
* commit 'f7497c9e551dd3bcbb7438211f5022cc6341c527':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
 2013-02-26 18:04:33 +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
Irfan Sheriff
9fbdda42a2 Merge "Fix leak in WifiManager" into jb-mr2-dev 2013-02-26 17:04:58 +00:00
Irfan Sheriff
302b06de7e Fix leak in WifiManager 
Avoid leaks from having a channel connection per manager instance

Bug: 8254124
Change-Id: I10de91d7e5a775bc14bbab245734717d3b2f90d5
 2013-02-26 09:01:48 -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
The Android Automerger
c67dcfae73 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-02-26 08:50:51 -08:00
Daniel Sandler
30a51b3f01 Merge "Spurious file removed." into jb-mr2-dev 2013-02-26 16:41:16 +00:00
Robert Ly
c6a983c629 am a1ee7539: am c6793135: am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit 'a1ee7539ff07fb5b6ad9244e3e9fa66106962b93':
  docs: remove games references
 2013-02-26 16:08:54 +00: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
Daniel Sandler
4d85af68a4 Spurious file removed. 
Change-Id: I2ac3f417553aea806ad570e247afc985e9ececb3
 2013-02-26 10:51:45 -05:00
Robert Ly
af7b843e97 docs: remove games references 
Change-Id: I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 07:49:56 -08:00
Jean Chalard
548655045a Fix dead key -> space combination. 
This also fixes "dead key -> same dead key" combination.
Both these key sequences should only give the non-combining
version of the combining character.

Bug: 8158374
Change-Id: I51f01685dd2997c2c5316ce6aa4f10ac9354c877
 2013-02-25 23:48:59 -08:00
Robert Ly
60e37947f7 am c1da3af5: am 9e49d2af: am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit 'c1da3af593cb78843d7f8375c09b4f91b6f1e742':
  docs: gms cheddar updates for g+
 2013-02-26 06:10:47 +00: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
Dianne Hackborn
3cbdddbd5c Add Bundle APIs for putting/getting Binder objects. 
This is really useful for certain cases, you just need
to be thoughtful and careful about what you are doing.

Change-Id: I314592480e447a6d8346f5089fade35da50b3510
 2013-02-25 18:37:18 -08:00
Dianne Hackborn
efcc1a23a1 App ops: adding operations for reading/writing clipboard. 
Change-Id: Ic4cade153618fe86954754a3b3edde64a52a0a9c
 2013-02-25 18:02:35 -08:00
Robert Ly
7ea8b152ec am 998cb7d3: am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit '998cb7d3f0881e41fe9ab0570716fc648c760d9e':
  docs: gms and gcm javadocs
 2013-02-26 02:00:53 +00: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
Michael Wright
5633e23c22 Move stack dump off of InputDispatcher thread 
Change-Id: I7250a0488c3e4c5dc159f4635a57e1e49aa8397a
 2013-02-25 17:52:37 -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
Eino-Ville Talvala
c0e55bd3cf Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev 2013-02-26 01:36:05 +00:00
Craig Mautner
18f04b96ed Revert ActivityManager changes for tasks. DO NOT MERGE 
Keeping all activity=>task changes in master and removing them
from jb-mr2.

Revert "Update histories simultaneously."
Revert "Add null check to setAppGroupId."
Revert "Fix crashing bug in validator."
Revert "Switch topRunning* and moveTaskTo*"
Revert "Begin switch over to task based history."
Revert "Reset and reuse Iterators and don't new() one."
Revert "Remove AppWindowToken lists."
Revert "Fix build."
Revert "Remove unused App methods."
Revert "Stop using AppToken movement and start using Task."
Revert "Replace access to mAppTokens with AppTokenIterator"
Revert "Refactor setAppOpVisibility implementation."
Revert "Add AppWindowTokens to TaskList."
Revert "Make ActivityStack.mHistory private."
Revert "Migrate AppWindowToken lists into DisplayContent."

Change-Id: I5722c9a4956dccb52864207e2967690bc58e4ebb
 2013-02-25 17:12:44 -08:00
Justin Ho
84e78a2759 Revert "Fix ListView is not scrolled properly with arrows" 
This reverts commit db68fac12daa2cf4a7568308995e218aed92728a.
 2013-02-25 17:12:35 -08:00
Craig Mautner
2e5528c5e0 Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev 2013-02-26 01:08:28 +00:00
Craig Mautner
2ad920759b Revert ActivityManager changes for tasks. DO NOT MERGE 
Keeping all activity=>task changes in master and removing them
from jb-mr2.

Revert "Update histories simultaneously."
Revert "Add null check to setAppGroupId."
Revert "Fix crashing bug in validator."
Revert "Switch topRunning* and moveTaskTo*"
Revert "Begin switch over to task based history."
Revert "Reset and reuse Iterators and don't new() one."
Revert "Remove AppWindowToken lists."
Revert "Fix build."
Revert "Remove unused App methods."
Revert "Stop using AppToken movement and start using Task."
Revert "Replace access to mAppTokens with AppTokenIterator"
Revert "Refactor setAppOpVisibility implementation."
Revert "Add AppWindowTokens to TaskList."
Revert "Make ActivityStack.mHistory private."
Revert "Migrate AppWindowToken lists into DisplayContent."

Change-Id: I5722c9a4956dccb52864207e2967690bc58e4ebb
 2013-02-25 17:07:39 -08:00
Mathias Agopian
19a38f6f40 Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" into jb-mr2-dev 2013-02-26 00:55:25 +00:00
Mathias Agopian
89ceb6e2d9 Merge "regenerate GLES java bindings" into jb-mr2-dev 2013-02-26 00:52:37 +00:00
Mathias Agopian
ffddc9b804 Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface 
also fix a typo that made us call the wrong Surface ctor

Bug: 8225509
Change-Id: I23f92179b6003d4c3e0febb35166c1caeafa27f5
 2013-02-25 16:49:57 -08:00
Mathias Agopian
15284dee8e regenerate GLES java bindings 
- added most missing validation checks
    - glGet* validation reimplement from khronos documentation

    Bug: 7402895

Change-Id: I92a805bb1aba1600d3372dc2db22eab08c975d7f
 2013-02-25 16:48:44 -08:00
Dianne Hackborn
42bd71e031 Merge "Fix typo." into jb-mr2-dev 2013-02-26 00:33:32 +00:00
Romain Guy
8889eb8d51 Merge "Rename debug property and expose it in HardwareRenderer" into jb-mr2-dev 2013-02-26 00:22:52 +00:00
Romain Guy
08bca88b27 Rename debug property and expose it in HardwareRenderer 
Change-Id: If46a9bc14a50f6c9a202d901881b36bbac32cba3
 2013-02-25 16:21:30 -08:00
Justin Ho
51e7836035 Merge "Revert "Fix ListView is not scrolled properly with arrows"" into jb-mr2-dev 2013-02-26 00:12:25 +00:00
Justin Ho
3cf7b3c592 Revert "Fix ListView is not scrolled properly with arrows" 
This reverts commit db68fac12daa2cf4a7568308995e218aed92728a.
 2013-02-25 16:08:27 -08:00