Dianne Hackborn
208d937b61
Better exceptions when LoadedApk fails.
...
Change-Id: Iba578c3872c6aeba3bf468735f06bd486d661454
2013-02-25 13:17:54 -08:00
Joe Malin
88a1cf841e
am 0c7d1aba: am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit '0c7d1abaae25073cafa4542ee032df9c54a01cd9':
Bug 8261430: Typo in Notifications
2013-02-25 19:39:41 +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
Jeff Sharkey
954e3e9018
Merge "Require command and argument separation, cleanup." into jb-mr2-dev
2013-02-25 19:13:00 +00:00
Jeff Sharkey
7b4596fd68
Require command and argument separation, cleanup.
...
When invoking NativeDaemonCommands, require that base command and
arguments are separate. Clean up reverse tethering commands, and
remove deprecated throttle events.
Change-Id: I302a74130b4f7c3f3045815a56d566e89c8969f6
2013-02-25 11:02:50 -08:00
Scott Main
f4b36ad161
am c4bed529: am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page
...
* commit 'c4bed529101b233f66e60e18a54ef6c9b97357f4':
docs: add google io registration announcement to home page
2013-02-25 18:46:53 +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
02a4cec107
am 1f954f2f: 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 '1f954f2feedbff1ccfd9154611ac915f0c1c2e47':
docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-02-25 18:25:15 +00: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
fec1178bbf
am 92f3e9a1: am e88c0d9e: Merge "Recognize odex files in memory accounting."
...
* commit '92f3e9a1fba2873c00d1d89179c051a82e924d76':
Recognize odex files in memory accounting.
2013-02-25 18:09:55 +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
Maggie Benthall
6794458f86
Add location sharing toggle user restriction.
...
And add support for respecting it.
Change-Id: Ia5cf9134c5f5741c3f55afadbe54f862da7bfe5b
2013-02-25 12:45:14 -05:00
Eino-Ville Talvala
788717ca59
Camera and MediaRecorder: Support AppOps
...
- Allow media processes to update AppOps state
- Pass package name to media services
Bug: 8181262
Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
2013-02-25 09:27:42 -08:00
Ian Rogers
e88c0d9ec3
Merge "Recognize odex files in memory accounting."
2013-02-25 17:13:24 +00:00
The Android Automerger
7c1ac2f5b5
merge in jb-mr2-release history after reset to master
2013-02-25 05:56:00 -08:00
Wink Saville
ff4fcdb98c
Tweak logging and some code reformatting.
...
Add logAndAddLogRec method that logs a string and adds it to LogRecords.
Add loge(s, e)
Add missing javadoc to the logging methods
Reformatted the code.
Change-Id: I42f39e45aae77e5b6968f16b6b83f4804ccb7e73
2013-02-24 07:21:45 -08:00
Michael Wright
c50536b85a
Merge "Disable kernel keyrepeat"
2013-02-23 06:33:08 +00:00
Elliott Hughes
dbc3c407ae
Remove obsolete traceview file format documentation.
...
Bug: http://code.google.com/p/android/issues/detail?id=51286
Change-Id: I9f2093c81b194526e79ea098ae073b60c63e9442
2013-02-22 21:21:03 -08:00
Ian Rogers
9f8589c31f
Recognize odex files in memory accounting.
...
Give odex files the same heap category as dex files.
Change-Id: I82539e20ac20a2b80c63c0cfceb266d9c59e22b7
2013-02-22 20:35:56 -08:00
Mathias Agopian
0d1ab1db22
Merge "regenerate egl/gles stubs from glgen"
2013-02-23 04:13:34 +00:00
Mathias Agopian
89be00bcda
regenerate egl/gles stubs from glgen
...
those are minor cosmetic changes.
Change-Id: I84ee5383577f0ca33ed7cc32d03e53c1475f068d
2013-02-22 20:08:06 -08:00
Dianne Hackborn
bd0dc13cb8
Merge "Formalize overscan metrics."
2013-02-23 03:15:35 +00:00
Dianne Hackborn
c4aad01cbb
Formalize overscan metrics.
...
The window manager now maintains and reports a new formal
"overscan insets" for each window, much like the existing
content and visible insets. This is used to correctly
position the various UI elements in the various combination
of layout options. In particular, this allows us to have
an activity that is using fitSystemWindows to have the content
of its UI extend out to the visible content part of the screen
while still positioning its fixed UI elements inside the
standard content rect (and the entire window extending all
the way into the overscan area to fill the screen as desired).
Okay, maybe that is not written so clearly. Well, it made
my head hurt too, so suffer!
The key thing is that windows now need to know about three
rectangles: the overall rectangle of the window, the rectangle
inside of the overscan area, and the rectangle inside of the
content area. The FLAG_LAYOUT_IN_OVERSCAN option controls
whether the second rectangle is pushed out to fill the entire
overscan area.
Also did some improvements to debug dumping in the window
manager.
Change-Id: Ib2368c4aff5709d00662c799507c37b6826929fd
2013-02-22 19:14:37 -08:00
Jason Sams
460fdd427c
Merge "add support for debug and profile contexts."
2013-02-23 02:44:49 +00:00
Jason Sams
add26dca07
add support for debug and profile contexts.
...
Change-Id: I759e54e365a344a93d725eb4fa70a2c4c98bf05a
2013-02-22 18:43:45 -08:00
Chris Craik
fb68065709
Merge "Add deferredList null check"
2013-02-23 00:42:53 +00:00
Chris Craik
ba868c3e22
Add deferredList null check
...
Needed for non-deferred mode (debug.hwui.disable_draw_defer = true)
Change-Id: I278cbe200aa6ce06fa92dc45c63ceda6e85a0cbe
2013-02-22 16:28:27 -08:00
Chris Craik
dd8697c095
Avoid double blur
...
bug:8204062
Avoids incorrectly blurring with RenderScript after a C++ blur
Additionally, avoids draw/blurring if the input text has empty bounds
Change-Id: Ibbaf74800fff7a6e4cda3aa24286b90e7aef589d
2013-02-22 16:16:16 -08:00
Robert Greenwalt
786525e8ea
Merge "Remove two new permission checks"
2013-02-22 23:51:53 +00:00
Robert Greenwalt
e436e4f8a4
Remove two new permission checks
...
These checks while technically reasonable are a hard to swallow API change
that may break existing apps and pragmatically serves no purpose: the protected
data is available in publicly readable java VM properties.
Change-Id: I522c493c2604a33e28d99e2be31054326c9a8323
2013-02-22 15:36:33 -08:00
Baligh Uddin
69a8dbbd67
Merge "Import translations. DO NOT MERGE"
2013-02-22 23:27:47 +00:00
Michael Wright
a0a72850c2
Disable kernel keyrepeat
...
Bug: 6332980
Change-Id: Ife69167285aad24ed3e4fa5b65abf59d8dfa4f0a
2013-02-22 14:46:49 -08:00
Jason Sams
ea53d7e0a4
Merge "Remove surfaceTextureOpaque test."
2013-02-22 22:31:09 +00:00
Adam Powell
0d74e8f8c6
am 06689433: am d61ff77e: Merge "Fix ListView is not scrolled properly with arrows"
...
* commit '06689433bc9e9d54e01bf4af9526dff2fc3dc862':
Fix ListView is not scrolled properly with arrows
2013-02-22 14:09:30 -08:00
Adam Powell
06689433bc
am d61ff77e: Merge "Fix ListView is not scrolled properly with arrows"
...
* commit 'd61ff77ee10b2c956df153e08b850e852ff5df57':
Fix ListView is not scrolled properly with arrows
2013-02-22 14:06:11 -08:00
Jason Sams
fa5cb40793
Merge "Fix build break."
2013-02-22 21:59:19 +00:00
Jason Sams
c089c2fc00
Fix build break.
...
Change-Id: I362c96787482bc8daee7dd4a01817ab7ed79b730
2013-02-22 13:57:36 -08:00
Jason Sams
fc0fd4f52c
Remove surfaceTextureOpaque test.
...
This test was for an API we decided not to
expose publically and have removed.
Change-Id: Ic2b8449b286c8d1fb1432ccc2db47f96ad43cc4b
2013-02-22 13:53:44 -08:00