OSDN Git Service
Robert Greenwalt [Mon, 11 Feb 2013 23:57:39 +0000 (23:57 +0000)]
Merge "Reintroduce the net.dns system properties <TEMP>"
Amith Yamasani [Mon, 11 Feb 2013 23:47:30 +0000 (15:47 -0800)]
Fix UserManager test
Change-Id: I927ffdda3dd5f69dc136e65c8069f2e480badfe9
Robert Greenwalt [Mon, 11 Feb 2013 23:25:10 +0000 (15:25 -0800)]
Reintroduce the net.dns system properties <TEMP>
Removing these properties broke video playback as they used
a custom dns resolver. We'll work together to resolve our
resolver issues in the future, but this was the easy fix to
get things working again.
bug:
8173236
Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0
Amith Yamasani [Mon, 11 Feb 2013 23:16:41 +0000 (23:16 +0000)]
Merge "Starting point for User Restrictions API"
Winson Chung [Mon, 11 Feb 2013 23:01:06 +0000 (23:01 +0000)]
Merge "Manually recycling bitmap memory when rotating ss, resetting canvas bitmap, adding logging. (Bug
7974275)"
Winson Chung [Mon, 11 Feb 2013 22:58:45 +0000 (14:58 -0800)]
Manually recycling bitmap memory when rotating ss, resetting canvas bitmap, adding logging. (Bug
7974275)
Change-Id: I1b0590a297610ee5fee4e68222144780ab6e55ec
Fabrice Di Meglio [Mon, 11 Feb 2013 22:42:56 +0000 (22:42 +0000)]
Merge "Fix bug #
7381967 Add RTL APIs to ViewParent"
Fabrice Di Meglio [Sat, 9 Feb 2013 02:15:07 +0000 (18:15 -0800)]
Fix bug #
7381967 Add RTL APIs to ViewParent
- add RTL apis to ViewParent
- remove awful and performance bottleneck casts in View during LayoutDirection,
TextDirection and TextAlignment resolutions.
Change-Id: I92a56b16382e13c28c1dad35f6f205620eb01bfe
Craig Mautner [Mon, 11 Feb 2013 22:13:48 +0000 (22:13 +0000)]
Merge "Make ActivityStack.mHistory private."
Svetoslav [Mon, 11 Feb 2013 21:03:08 +0000 (21:03 +0000)]
Merge "Refactoring of the Accessibility."
Svetoslav [Fri, 8 Feb 2013 03:21:42 +0000 (19:21 -0800)]
Refactoring of the Accessibility.
1. The accessibility manager service updates its internal state
based on which settings are enabled, what accessibility services
are installed and what features are requested by the enabled
services. It was trying to do the minimal amount of work to
react to contextual changes like these which resulted in missed
cases and complex code. Now there is a single method that reads
the contextual information and single method that reacts to
contextual changes. This makes the code much easier to maintain.
2. The accessibility manager service was not updating its internal
state when requested features from accessibility services change.
It was relying on changing system settings and reacting to the
settings change. This is problematic since the internal state is
not updated atomically which leads to race condition bugs. For
example, if touch exploration is enabled and a service requests
it is disabled, the internal state will not be updated but a
request for a settings change will be made. Now while the settings
change is propagating another request form the same service
comes to enable touch exploration but the system incorrectly
thinks touch exploration is enabled. At the end the feature is
disabled even though it was requested.
3. Fixed a potential NPE if the accessibility input filter's event
handler was nullified between processing two event batches.
4. Fixed a bug where, if magnification is enabled, it does not work
on the settings screen since the magnified bounds are not pushed
from the window manager to the accessibility manager.
Change-Id: Idf629a06480e12f0d88372762df6c024fe0d7856
Jean-Michel Trivi [Mon, 11 Feb 2013 19:28:49 +0000 (19:28 +0000)]
Merge "Add support for querying whether the music stream is active remotely"
Fabrice Di Meglio [Mon, 11 Feb 2013 18:50:47 +0000 (18:50 +0000)]
Merge "Fix bug #
8115437 Need to remove ArabicShaping from Framework"
Jean-Michel Trivi [Tue, 5 Feb 2013 00:24:09 +0000 (16:24 -0800)]
Add support for querying whether the music stream is active remotely
Bug
7485803
Change-Id: I554b44bd35b017fa4030a0d89779066c96594f2b
Craig Mautner [Mon, 11 Feb 2013 17:47:14 +0000 (17:47 +0000)]
Merge "Reset SensorEventListener when listener reenabled."
Craig Mautner [Thu, 17 Jan 2013 22:44:34 +0000 (14:44 -0800)]
Reset SensorEventListener when listener reenabled.
- Following disable and reenable of the WindowOrientationListener
the state was the same as before. State should be reset to default.
- Provide a Handler to the sensor task to deliver events on the
same Thread that WindowManagerPolicy operates on.
- Expand lock protection to all of WindowOrientationListener.
- Move WindowOrientationListener to policy package.
- Make SensorEventListenerImpl non-static.
Fixes bug
7964531.
Change-Id: I17cecf3d0b6d125cb3e4d7350c3adb3f62b684bd
Baligh Uddin [Mon, 11 Feb 2013 16:12:48 +0000 (08:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d6b97a7078b930416335dcf016bc820e1f09845
Auto-generated-cl: translation import
Adam Powell [Sat, 9 Feb 2013 02:38:01 +0000 (02:38 +0000)]
Merge "Fix setting action bar backgrounds after layout"
Adam Powell [Sat, 9 Feb 2013 01:32:24 +0000 (17:32 -0800)]
Fix setting action bar backgrounds after layout
Fix a bug that would prevent the drawable bounds from being set
correctly for action bar containers.
Change-Id: I396aa40e3d8f6e3b47bcd438e1f26bbfc7b20a7f
Dianne Hackborn [Sat, 9 Feb 2013 01:18:37 +0000 (01:18 +0000)]
Merge "Fix issue #
8133857: Tracking ANR in Gallery"
Dianne Hackborn [Fri, 8 Feb 2013 23:32:05 +0000 (15:32 -0800)]
Fix issue #
8133857: Tracking ANR in Gallery
Reworking the locking in resources so that we never hold the
state lock while calling in to potential long running operations.
This means the mTmpValue can no longer be final (since we need
to use it while the lock isn't held), so a new field needs to
be added as the lock and everything that touches mTmpValue must
deal with it being null, restoring the value in there when
possible, etc.
Change-Id: Ie5ffd0f66e5f2d0e869a62d72e7a55b1c74fe872
Jeff Brown [Sat, 9 Feb 2013 01:16:31 +0000 (17:16 -0800)]
Fix build break due to merge.
Change-Id: I08c39690ee9de825ff51afc7d102ee622af6ba13
Jeff Brown [Sat, 9 Feb 2013 01:03:42 +0000 (17:03 -0800)]
am
4fd60792: am
5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Android Git Automerger (1) and others
* commit '
4fd60792473711a10dc9b27faa1a35efe9e4d6a0':
Complete documentation of whereArgs (Issue #43061)
Jeff Brown [Sat, 9 Feb 2013 01:03:38 +0000 (17:03 -0800)]
am
64f4de03: am
fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Android Git Automerger (1) and others
* commit '
64f4de03037b279e389ca20297e9d5086f49564c':
frameworks/base: Added English UK keyboard layout for physical keyboards
Jeff Brown [Sat, 9 Feb 2013 00:58:14 +0000 (16:58 -0800)]
am
5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Gerrit Code Review (1) and Tim Roes (1)
* commit '
5262a1082663610a888d1145fd9676f7db41d397':
Complete documentation of whereArgs (Issue #43061)
Jeff Brown [Sat, 9 Feb 2013 00:58:09 +0000 (16:58 -0800)]
am
fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Gerrit Code Review (1) and Matt Beale (1)
* commit '
fa49a6b13ebf496ea01d5981f69084596d06d464':
frameworks/base: Added English UK keyboard layout for physical keyboards
Jeff Brown [Fri, 8 Feb 2013 23:56:04 +0000 (15:56 -0800)]
am
110fe9b3: am
fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '
110fe9b303be527c30a8af95b6fb7afac12968b5':
Fix ViewRootImpl to find missing focus using D-pad.
Amith Yamasani [Mon, 17 Dec 2012 19:12:09 +0000 (11:12 -0800)]
Starting point for User Restrictions API
Restrictions saved as key/value pairs, mostly booleans right now
but might be expanded to other types later.
Save and restore restrictions in the user manager service.
Enforce some of the restrictions at the framework level. Some
are enforced (also) at the app level, such as in Settings.
Change-Id: Id11ffe129cb6a177e094edf79635727388c26f40
Jeff Brown [Fri, 8 Feb 2013 23:49:51 +0000 (23:49 +0000)]
Merge "Complete documentation of whereArgs (Issue #43061)"
Jeff Brown [Fri, 8 Feb 2013 23:49:46 +0000 (15:49 -0800)]
am
fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit '
fe1f3a1beff9f73f6a04bcc35239038a21bc38ff':
Fix ViewRootImpl to find missing focus using D-pad.
Jeff Brown [Fri, 8 Feb 2013 23:49:10 +0000 (23:49 +0000)]
Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
The Android Open Source Project [Fri, 8 Feb 2013 23:45:50 +0000 (15:45 -0800)]
am
4b71a472: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# Via The Android Automerger (2) and The Android Open Source Project (1)
* commit '
4b71a472c0f254606e93b8f9f86f7df0e6dba522':
The Android Open Source Project [Fri, 8 Feb 2013 23:40:41 +0000 (15:40 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I728b304c185d7f0406b6d45334c10263bd38d769
Jeff Brown [Fri, 8 Feb 2013 23:29:11 +0000 (23:29 +0000)]
Merge "Fix ViewRootImpl to find missing focus using D-pad."
Craig Mautner [Fri, 8 Feb 2013 22:31:27 +0000 (14:31 -0800)]
Make ActivityStack.mHistory private.
Isolate the Activity history for later conversion to Task-based
management.
Change-Id: I4b6bf22de035c768aa705df0cc4f84486e8ede56
Romain Guy [Fri, 8 Feb 2013 22:01:05 +0000 (22:01 +0000)]
Merge "Deprecate useless BitmapDrawable constructor Bug #
2590549"
Romain Guy [Fri, 8 Feb 2013 21:58:53 +0000 (13:58 -0800)]
Deprecate useless BitmapDrawable constructor
Bug #
2590549
Change-Id: Icb45bf2d9836c43ed0825105f64d7b98afcdcdac
Romain Guy [Fri, 8 Feb 2013 21:57:24 +0000 (21:57 +0000)]
Merge "Apply the clip rect/region to drawLines()"
The Android Automerger [Fri, 8 Feb 2013 21:51:07 +0000 (13:51 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Romain Guy [Fri, 8 Feb 2013 21:46:40 +0000 (13:46 -0800)]
Apply the clip rect/region to drawLines()
Without the check to quickReject, drawConvexPath would never
setup the clip properly.
Change-Id: I23e5b25de3383c9e9b86eea4ee7a9552f8d9efb4
Dirk Dougherty [Fri, 8 Feb 2013 19:43:07 +0000 (11:43 -0800)]
am
b555029e: am
2e65e20c: am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
b555029e411498b86efad38a1948e4cfb4f43dd1':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Marco Nelissen [Fri, 8 Feb 2013 19:42:43 +0000 (11:42 -0800)]
am
85a1ee30: am
b683f354: am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '
85a1ee30215190b1782127a6afe323f4df4ef131':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Tim Murray [Fri, 8 Feb 2013 19:28:54 +0000 (19:28 +0000)]
Merge "Add API entry points for clipped kernels."
Dirk Dougherty [Fri, 8 Feb 2013 19:21:03 +0000 (11:21 -0800)]
am
2e65e20c: am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:17:50 +0000 (11:17 -0800)]
am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:16:11 +0000 (11:16 -0800)]
am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f2d89ef9d57b096962b802608a88d3483a51d08a':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:14:23 +0000 (11:14 -0800)]
am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:09:53 +0000 (19:09 +0000)]
Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
Baligh Uddin [Fri, 8 Feb 2013 17:54:56 +0000 (09:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia60bfa7a614e309583df7273a64fdcb1f4d60633
Auto-generated-cl: translation import
Marco Nelissen [Fri, 8 Feb 2013 16:44:36 +0000 (08:44 -0800)]
am
b683f354: am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
b683f3542a123a07823b51643b1973507bfb57e2':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Marco Nelissen [Fri, 8 Feb 2013 16:41:20 +0000 (08:41 -0800)]
am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review
* commit '
69abccc3cdacee354dec8867865a0577a4e14e63':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Marco Nelissen [Fri, 8 Feb 2013 16:22:09 +0000 (16:22 +0000)]
Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
Jan Bjernler [Mon, 30 Apr 2012 07:16:52 +0000 (09:16 +0200)]
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
MediaStore.Audio.getContentUriForPath() returns an uri to
internal storage if anything but /mnt/sdcard/ is sent in.
This fix checks if there is an additional sdcard
(normally called ext_card) or usb mass storage attached to
the device and then returns an uri to the external db.
The extra sdcard name and the usb mass storage name info is read from
the system environment variable SECONDARY_STORAGE so if a customer
chooses to change the name this will work as expected.
Change-Id: Ib78bca929fe382d4770df895149a0132f0e56994
Jesse Hall [Fri, 8 Feb 2013 04:29:33 +0000 (20:29 -0800)]
am
93194ffb: am
c2edfa2b: am
7c292062: Merge "Process all display events in order"
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '
93194ffbf16e051b7bcb696417d3869eee05b7e4':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 04:29:29 +0000 (20:29 -0800)]
am
5a5cc3dc: am
bc18fe85: am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '
5a5cc3dcb054716803401149aa1eee0d3cd4a19c':
Handle hotplug events as described instead of rescanning
Jesse Hall [Fri, 8 Feb 2013 04:26:27 +0000 (20:26 -0800)]
am
c2edfa2b: am
7c292062: Merge "Process all display events in order"
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
c2edfa2b9649f67c142b181c54580c015badfca3':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 04:26:23 +0000 (20:26 -0800)]
am
bc18fe85: am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
bc18fe851c98dbe6be4eb2655efb1ef95902d961':
Handle hotplug events as described instead of rescanning
Svetoslav Ganov [Fri, 8 Feb 2013 03:39:04 +0000 (03:39 +0000)]
Merge "Delay accessibility announcements in the keyguard."
Robert Ly [Fri, 8 Feb 2013 02:03:20 +0000 (18:03 -0800)]
am
74e8693d: am
ddc0a7bd: am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
74e8693d310d75e98c5cf62340612d474f6f197b':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 02:01:17 +0000 (18:01 -0800)]
am
ddc0a7bd: am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
ddc0a7bdf94f4ba84dd4b89b693eb148ff32b5d3':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:57:57 +0000 (17:57 -0800)]
am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
11fa446033a8600b681efeb857507388e8113d72':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:55:20 +0000 (17:55 -0800)]
am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
9da9a7cda27a9b9a3a08e64e81d0ca10ac4c4ec1':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:53:29 +0000 (17:53 -0800)]
am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '
e60b6023ae4fdea932d0effc553dddc38117d235':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:48:14 +0000 (01:48 +0000)]
Merge "makefile changes for gcm javadocs" into jb-mr1-dev
Jesse Hall [Fri, 8 Feb 2013 01:41:50 +0000 (17:41 -0800)]
am
7c292062: Merge "Process all display events in order"
# Via Gerrit Code Review
* commit '
7c2920625eb72216025aeb8ea8dce544df0eca36':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 01:41:44 +0000 (17:41 -0800)]
am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Gerrit Code Review
* commit '
fd1c028e34fc559ccccebd18979ee85ec7821dea':
Handle hotplug events as described instead of rescanning
Dirk Dougherty [Fri, 8 Feb 2013 01:32:35 +0000 (17:32 -0800)]
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
Jesse Hall [Fri, 8 Feb 2013 01:29:32 +0000 (01:29 +0000)]
Merge "Process all display events in order"
Katie McCormick [Fri, 8 Feb 2013 01:29:18 +0000 (17:29 -0800)]
am
89e7aa3d: am
2306f0ee: am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
89e7aa3dae133fd38007eddb47a3e372abb68d4d':
Doc change: Scroller Javadoc Bug #
7966653
Jesse Hall [Fri, 8 Feb 2013 01:29:03 +0000 (01:29 +0000)]
Merge "Handle hotplug events as described instead of rescanning"
Katie McCormick [Fri, 8 Feb 2013 01:26:13 +0000 (17:26 -0800)]
am
2306f0ee: am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
2306f0ee3396cd8a85d04dfbc08fb8c5ffa6699f':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:23:00 +0000 (17:23 -0800)]
am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
ee27bcda8644f8c3f2328acc248b8c5c9d152f59':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:21:29 +0000 (17:21 -0800)]
am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
b68702eb0526633e51d9dbfe6fc971c168e1274a':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:18:48 +0000 (17:18 -0800)]
am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '
0e66f16abd651bdf5833f4aede4899e627d7b333':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:14:47 +0000 (01:14 +0000)]
Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
Wink Saville [Fri, 8 Feb 2013 01:06:02 +0000 (01:06 +0000)]
Merge "Move a few files from frameworks/opt/telephony to frameworks/base."
Wink Saville [Fri, 8 Feb 2013 01:03:05 +0000 (17:03 -0800)]
Move a few files from frameworks/opt/telephony to frameworks/base.
Because ISms.aidl imports PendingIntent we couldn't easily
make opt/telephony part of the PDK. So this change moves
ISms.aidl and SmsRawData.*, which ISms.aidl also imports,
back to frameworks/base.
Change-Id: Ia64c6e771d5a292d9bfebb413a43f3745df55c85
Baligh Uddin [Fri, 8 Feb 2013 00:55:19 +0000 (00:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 8 Feb 2013 00:44:41 +0000 (00:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Katie McCormick [Thu, 7 Feb 2013 02:15:13 +0000 (18:15 -0800)]
Doc change: Scroller Javadoc Bug #
7966653
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
Katie McCormick [Thu, 7 Feb 2013 23:59:35 +0000 (15:59 -0800)]
am
1309c9e2: am
93ebe284: am
80a01a7f: am
ef4196d0: am
89fafaea: Doc update: clean up
# Via Android Git Automerger (4) and Katie McCormick (1)
* commit '
1309c9e2afe79ccd73cbf76f52477ffba92d10bd':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 23:57:21 +0000 (15:57 -0800)]
am
93ebe284: am
80a01a7f: am
ef4196d0: am
89fafaea: Doc update: clean up
# Via Android Git Automerger (3) and Katie McCormick (1)
* commit '
93ebe2845c7f2d7afea1b679020446adcd0047ee':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 23:54:33 +0000 (15:54 -0800)]
am
80a01a7f: am
ef4196d0: am
89fafaea: Doc update: clean up
# Via Android Git Automerger (2) and Katie McCormick (1)
* commit '
80a01a7f1d30ea5540eb8827dd221623f46e5a80':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 23:52:32 +0000 (15:52 -0800)]
am
ef4196d0: am
89fafaea: Doc update: clean up
# Via Android Git Automerger (1) and Katie McCormick (1)
* commit '
ef4196d0ec0a5e89c51b3cc455f083af2fbf3b98':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 23:49:36 +0000 (15:49 -0800)]
am
89fafaea: Doc update: clean up
# Via Katie McCormick
* commit '
89fafaeae73cc265f13775944ccb2841bbc6766c':
Doc update: clean up
Romain Guy [Thu, 7 Feb 2013 23:32:42 +0000 (23:32 +0000)]
Merge "Don't clip when drawing a layer"
Tim Murray [Thu, 7 Feb 2013 20:16:41 +0000 (12:16 -0800)]
Add API entry points for clipped kernels.
Change-Id: Idf474a5ac391c41e9215cd2f03e7f8c4bfb875fa
Romain Guy [Thu, 7 Feb 2013 23:20:55 +0000 (15:20 -0800)]
Don't clip when drawing a layer
A layer will, by definition, clip its content already. The extra
clip added by the UI toolkit/renderer is wasteful and in some
situations very expensive. If a layered view is rotated, the clip
will be transformed into a non-rectangular region, thus forcing
the renderer to rely on the stencil buffer. The whole point of
using layers is to draw efficiently so let's avoid this case.
Change-Id: I813465f6468cc386b84a4d058c11a258fef8507a
Jeff Sharkey [Thu, 7 Feb 2013 23:03:33 +0000 (23:03 +0000)]
Merge "Use safe buffer sizes when parsing network stats."
Jeff Sharkey [Thu, 7 Feb 2013 23:02:55 +0000 (15:02 -0800)]
Use safe buffer sizes when parsing network stats.
Change-Id: I1733c1ddc48f9410136aee7af7889fdc7be8cc10
Chris Craik [Thu, 7 Feb 2013 22:53:44 +0000 (22:53 +0000)]
Merge "Correctly resume profileRendering"
Jeff Sharkey [Thu, 7 Feb 2013 22:27:55 +0000 (22:27 +0000)]
Merge "Improve TrafficStats UID APIs."
The Android Automerger [Thu, 7 Feb 2013 22:23:30 +0000 (14:23 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Katie McCormick [Thu, 7 Feb 2013 22:23:14 +0000 (14:23 -0800)]
Doc update: clean up
Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682
Alon Albert [Thu, 7 Feb 2013 22:05:08 +0000 (22:05 +0000)]
Merge "COnvert sync error to int"
Jesse Hall [Mon, 19 Nov 2012 18:53:26 +0000 (10:53 -0800)]
Process all display events in order
Display events in each batch received from IPC were being processed in
reverse order, and stopped after the first vsync event (latest
chronologically) was handled. This makes perfect sense for vsync
events, but is broken for hotplug events.
Now we process them all in order, handling all except vsync as we see
them. For vsync events, only the last is reported.
Bug:
7491120
Change-Id: I448d139d21dc27128d75ca1d661de666fff51bcb
Jesse Hall [Thu, 8 Nov 2012 19:55:14 +0000 (11:55 -0800)]
Handle hotplug events as described instead of rescanning
Hotplug events say which display they're for and whether the display
was connected or disconnected. Before, this info was ignored, and the
event just triggered a rescan of all displays. If a display was
disconnected and then reconnected quickly, the rescan would treat this
as a no-op or a device property change and wouldn't turn the display
on.
Now the display manager attempts to update its state with the change
the event describes. So a quick disconnect/connect cycle will cause
the display to be turned on since the display manager will have
updated its internal state to reflect the disconnect event, and will
treat the connect event as a new display rather than a device property
change.
Bug:
7491120
Change-Id: Ia83f7c96b7f16f4c1bed2a73e9b56b0bf7ee3984
Jeff Sharkey [Wed, 16 Jan 2013 01:25:09 +0000 (17:25 -0800)]
Improve TrafficStats UID APIs.
Deprecate transport layer statistics, leaving only the summarized
network layer statistics.
Improve documentation to be clear about layers where measurements
occur, and their behavior since boot. Under the hood, move to using
xt_qtaguid UID statistics.
Bug:
6818637,
7013662
Change-Id: I9f26992e5fcdebd88c671e5765bd91229e7b0016
Chris Craik [Thu, 7 Feb 2013 20:57:10 +0000 (12:57 -0800)]
Correctly resume profileRendering
Ensure profileRendering reschedules a previously created profiler callback if
disabled and reenabled
Change-Id: I181ac5043966b99bb8d21e69ce4fdd7494102acb
Daniel Sandler [Thu, 17 Jan 2013 05:21:05 +0000 (00:21 -0500)]
New API to request a list of current notifications.
The ACCESS_NOTIFICATIONS permission is signature|system only.
Change-Id: I41338230aee9611117cbdac251c1b6b6c3cebf00