summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix leak in WifiManager" into jb-mr2-devIrfan Sheriff2013-02-263-55/+68
|\
| * Fix leak in WifiManagerIrfan Sheriff2013-02-263-55/+68
| | | | | | | | | | | | | | Avoid leaks from having a channel connection per manager instance Bug: 8254124 Change-Id: I10de91d7e5a775bc14bbab245734717d3b2f90d5
* | Merge "Spurious file removed." into jb-mr2-devDaniel Sandler2013-02-261-0/+0
|\ \
| * | Spurious file removed.Daniel Sandler2013-02-261-0/+0
| |/ | | | | | | Change-Id: I2ac3f417553aea806ad570e247afc985e9ececb3
* | am a1ee7539: am c6793135: am 1d13e850: am 928f6382: am af7b843e: docs: ↵Robert Ly2013-02-262-12/+3
|\ \ | | | | | | | | | | | | | | | | | | remove games references * commit 'a1ee7539ff07fb5b6ad9244e3e9fa66106962b93': docs: remove games references
| * \ am c6793135: am 1d13e850: am 928f6382: am af7b843e: docs: remove games ↵Robert Ly2013-02-262-12/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | references * commit 'c679313559e90f0c35f15e1b5070c277ada981d3': docs: remove games references
| | * \ am 1d13e850: am 928f6382: am af7b843e: docs: remove games referencesRobert Ly2013-02-262-12/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '1d13e85031eff239e035afb1ff474502caf01104': docs: remove games references
| | | * \ am 928f6382: am af7b843e: docs: remove games referencesRobert Ly2013-02-262-12/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '928f6382eb4ac0b6ea3f5141ba297412e26d8fe6': docs: remove games references
| | | | * \ am af7b843e: docs: remove games referencesRobert Ly2013-02-262-12/+3
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af7b843e97d5228bf8cc57aa37acf6c7d58464e8': docs: remove games references
| | | | | * | docs: remove games referencesRobert Ly2013-02-262-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32f25b692872ed7827e611890c563498993b2480
* | | | | | | am c1da3af5: am 9e49d2af: am 045bede8: am 4240da1a: am 7cbf2bc6: Merge ↵Robert Ly2013-02-266-49/+59
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: gms cheddar updates for g+" into jb-mr1-dev * commit 'c1da3af593cb78843d7f8375c09b4f91b6f1e742': docs: gms cheddar updates for g+
| * | | | | | am 9e49d2af: am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar ↵Robert Ly2013-02-256-49/+59
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updates for g+" into jb-mr1-dev * commit '9e49d2af7289ff7f7c96568f6c41cb22295e4613': docs: gms cheddar updates for g+
| | * | | | | am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for ↵Robert Ly2013-02-256-49/+59
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | g+" into jb-mr1-dev * commit '045bede816c6578379911567f68046393f70247c': docs: gms cheddar updates for g+
| | | * | | | am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into ↵Robert Ly2013-02-256-49/+59
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '4240da1a888edca033ca10b6995ea9c7df5c7e5b': docs: gms cheddar updates for g+
| | | | * | | am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-devRobert Ly2013-02-256-49/+59
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | * commit '7cbf2bc6810ca4623d990258823d25e307ebbfd7': docs: gms cheddar updates for g+
| | | | | * | Merge "docs: gms cheddar updates for g+" into jb-mr1-devRobert Ly2013-02-266-49/+59
| | | | | |\ \
| | | | | | * | docs: gms cheddar updates for g+Robert Ly2013-02-256-49/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ffd94fa17f0911f83e0c40462861a9e6080a197
* | | | | | | | am 998cb7d3: am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms ↵Robert Ly2013-02-26146-4760/+78159
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and gcm javadocs * commit '998cb7d3f0881e41fe9ab0570716fc648c760d9e': docs: gms and gcm javadocs
| * | | | | | | am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocsRobert Ly2013-02-25146-4760/+78159
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ce861ff3497c28bbddc40ee2232927c2fa3ab489': docs: gms and gcm javadocs
| | * | | | | | am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocsRobert Ly2013-02-25146-4760/+78159
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd470874be53add0ec46436682b4da46768b82497': docs: gms and gcm javadocs
| | | * | | | | am ee46979b: am 05c8e63c: docs: gms and gcm javadocsRobert Ly2013-02-25146-4760/+78159
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee46979bde5f59fbeccd01e62fb572c66577e21f': docs: gms and gcm javadocs
| | | | * | | | am 05c8e63c: docs: gms and gcm javadocsRobert Ly2013-02-25146-4760/+78159
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '05c8e63c760eabfbd1cb19d996038c280472c357': docs: gms and gcm javadocs
| | | | | * | | docs: gms and gcm javadocsRobert Ly2013-02-25146-4760/+78159
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | Change-Id: I59c11622ee90ec1ce527711afed55818f5818d3f
* | | | | | | Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-devEino-Ville Talvala2013-02-265-9/+36
|\ \ \ \ \ \ \
| * | | | | | | Camera and MediaRecorder: Support AppOpsEino-Ville Talvala2013-02-255-9/+36
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow media processes to update AppOps state - Pass package name to media services Bug: 8181262 Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
* | | | | | | Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-devCraig Mautner2013-02-2617-1607/+1023
|\ \ \ \ \ \ \
| * | | | | | | Revert ActivityManager changes for tasks. DO NOT MERGECraig Mautner2013-02-2517-1607/+1023
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null ↵Mathias Agopian2013-02-263-9/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Surface" into jb-mr2-dev
| * | | | | | | Fix SurfaceControl.setDisplaySurface() such that it accepts a null SurfaceMathias Agopian2013-02-253-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fix a typo that made us call the wrong Surface ctor Bug: 8225509 Change-Id: I23f92179b6003d4c3e0febb35166c1caeafa27f5
* | | | | | | | Merge "regenerate GLES java bindings" into jb-mr2-devMathias Agopian2013-02-269-2899/+2442
|\ \ \ \ \ \ \ \
| * | | | | | | | regenerate GLES java bindingsMathias Agopian2013-02-259-2899/+2442
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added most missing validation checks - glGet* validation reimplement from khronos documentation Bug: 7402895 Change-Id: I92a805bb1aba1600d3372dc2db22eab08c975d7f
* | | | | | | | Merge "Fix typo." into jb-mr2-devDianne Hackborn2013-02-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo.Dianne Hackborn2013-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71c8458e02dc9b9a4c59e51ded37b57a930038f9
* | | | | | | | | Merge "Rename debug property and expose it in HardwareRenderer" into jb-mr2-devRomain Guy2013-02-262-1/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename debug property and expose it in HardwareRendererRomain Guy2013-02-252-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If46a9bc14a50f6c9a202d901881b36bbac32cba3
* | | | | | | | | | Merge "Revert "Fix ListView is not scrolled properly with arrows"" into ↵Justin Ho2013-02-261-15/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| * | | | | | | | | | Revert "Fix ListView is not scrolled properly with arrows"Justin Ho2013-02-251-15/+3
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit db68fac12daa2cf4a7568308995e218aed92728a.
* | | | | | | | | | Merge "Add version code constant for JB MR2." into jb-mr2-devDianne Hackborn2013-02-253-15/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add version code constant for JB MR2.Dianne Hackborn2013-02-253-15/+15
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60fc76bbeb3c5e85d716179e9e3ea5758bafaf69
* | | | | | | | | | Merge "Better exceptions when LoadedApk fails." into jb-mr2-devDianne Hackborn2013-02-251-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Better exceptions when LoadedApk fails.Dianne Hackborn2013-02-251-1/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba578c3872c6aeba3bf468735f06bd486d661454
* | | | | | | | | | am 70347e83: am 8d4d4cf2: Merge "Remove obsolete traceview file format ↵Elliott Hughes2013-02-251-122/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation." * commit '70347e83525c861379066d2f20c9105cfd284edb': Remove obsolete traceview file format documentation.
| * | | | | | | | | am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation."Elliott Hughes2013-02-251-122/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d4d4cf283d12821caba321204759f2ce3fd210a': Remove obsolete traceview file format documentation.
| | * \ \ \ \ \ \ \ \ Merge "Remove obsolete traceview file format documentation."Elliott Hughes2013-02-251-122/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Remove obsolete traceview file format documentation.Elliott Hughes2013-02-221-122/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://code.google.com/p/android/issues/detail?id=51286 Change-Id: I9f2093c81b194526e79ea098ae073b60c63e9442
* | | | | | | | | | | | Merge "Add new property to debug non-rectangular clip operations" into ↵Romain Guy2013-02-258-2/+77
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| * | | | | | | | | | | Add new property to debug non-rectangular clip operationsRomain Guy2013-02-258-2/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new property called "debug.hwui.show_stencil_clip" that accepts the following values: - "highlight", colorizes in green any drawing command that's tested against a non-rectangular clip region - "region", shows the non-rectangular clip region in blue every time it is used - "hide", default value, nothing is shown Change-Id: I83c8602310edc4aaeb8b905371cdd185b17d32b5
* | | | | | | | | | | | Merge "Add location sharing toggle user restriction." into jb-mr2-devMaggie Benthall2013-02-254-9/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add location sharing toggle user restriction.Maggie Benthall2013-02-254-9/+41
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add support for respecting it. Change-Id: Ia5cf9134c5f5741c3f55afadbe54f862da7bfe5b
* | | | | | | | | | | | Merge "Lookup permission groups by name" into jb-mr2-devRomain Guy2013-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | / / / / / | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
generated by cgit v1.1 at 2024-12-27 07:24:03 +0000