OSDN Git Service
Victoria Lease [Wed, 17 Apr 2013 16:27:49 +0000 (09:27 -0700)]
am
25df1a82: Merge "use appropriate fallback chain for style" into jb-mr2-dev
* commit '
25df1a82a846cbdbdd2de0ce3d6741dfcfdf31fd':
use appropriate fallback chain for style
Victoria Lease [Wed, 17 Apr 2013 16:23:37 +0000 (16:23 +0000)]
Merge "use appropriate fallback chain for style" into jb-mr2-dev
Daniel Sandler [Wed, 17 Apr 2013 16:07:02 +0000 (09:07 -0700)]
am
66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev
* commit '
66769767b68f3fbe586c153d9d483916e4d9006b':
Treat the default sound Uri the same as DEFAULT_SOUND.
Daniel Sandler [Wed, 17 Apr 2013 16:04:33 +0000 (16:04 +0000)]
Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev
Daniel Sandler [Wed, 17 Apr 2013 04:17:22 +0000 (00:17 -0400)]
Treat the default sound Uri the same as DEFAULT_SOUND.
For the purposes of deciding whether or not to invoke the
"fallback vibrate", that is. (RingtonePicker will return
content://settings/system/notification_sound when "Default"
is chosen, so if the app pops this Uri directly into
Notification.sound, we should treat it like DEFAULT_SOUND
and look to see whether the system notification sound is
not None before running the fallback vibration.)
Bug:
8627641
Change-Id: Ia469b8e4d5d7647ce1a8a179f591ed7a3443b5c5
Chet Haase [Wed, 17 Apr 2013 14:04:38 +0000 (07:04 -0700)]
am
8bba7510: Fix build - remove obsolete import of Animatable
* commit '
8bba7510bc96d5404c070a4846318ee6a9eb1365':
Fix build - remove obsolete import of Animatable
Chet Haase [Wed, 17 Apr 2013 13:43:18 +0000 (06:43 -0700)]
Fix build - remove obsolete import of Animatable
Change-Id: I3133669386f50177c863f8a58733be771f819a17
Chet Haase [Wed, 17 Apr 2013 13:38:38 +0000 (06:38 -0700)]
am
873d3ca4: Merge "Remove Animatable interface" into jb-mr2-dev
* commit '
873d3ca43dc054222e635586b760125078fb7c39':
Remove Animatable interface
Chet Haase [Wed, 17 Apr 2013 13:36:00 +0000 (13:36 +0000)]
Merge "Remove Animatable interface" into jb-mr2-dev
Kristian Monsen [Wed, 17 Apr 2013 02:24:56 +0000 (19:24 -0700)]
am
87c67f31: Merge "Part of fix for bug
8629392" into jb-mr2-dev
* commit '
87c67f315c0eea253c73ae7ebb40931c686a406d':
Part of fix for bug
8629392
Kristian Monsen [Wed, 17 Apr 2013 02:22:25 +0000 (02:22 +0000)]
Merge "Part of fix for bug
8629392" into jb-mr2-dev
Kristian Monsen [Wed, 17 Apr 2013 01:14:47 +0000 (18:14 -0700)]
Part of fix for bug
8629392
Adding extra logging to fix cts bugs that are only on bots
Change-Id: I24b4b7aad200ffc23c002f4a8f0fe9246991c4f0
Chris Craik [Wed, 17 Apr 2013 01:00:18 +0000 (18:00 -0700)]
am
ec5dc76a: Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev
* commit '
ec5dc76a15081136fa57d10a231d1c5ac5901421':
Make layer double drawing visible in overdraw debug mode
Philip Milne [Wed, 17 Apr 2013 01:00:15 +0000 (18:00 -0700)]
am
61527436: Merge "Fix for bug
8272673: GridLayout in battery details is cut off." into jb-mr2-dev
* commit '
61527436b7fd5d8dd42eaf8052c02816e6a13887':
Fix for bug
8272673: GridLayout in battery details is cut off.
Chris Craik [Wed, 17 Apr 2013 00:58:43 +0000 (00:58 +0000)]
Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev
Philip Milne [Wed, 17 Apr 2013 00:56:55 +0000 (00:56 +0000)]
Merge "Fix for bug
8272673: GridLayout in battery details is cut off." into jb-mr2-dev
Chet Haase [Wed, 17 Apr 2013 00:54:14 +0000 (17:54 -0700)]
Remove Animatable interface
Push the interface methods from the new Animatable interface back
down into Animator, from whence they came.
Issue #
8634310 Remove Animatable interface
Change-Id: I79e26001709d791d54fcb02561640fe2e008b1fd
Ben Gruver [Wed, 17 Apr 2013 00:47:57 +0000 (17:47 -0700)]
am
53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev
* commit '
53f22ad9c30e03f4762737a722b2762dcf934523':
Monitor the firewall rules file for changes
Ben Gruver [Wed, 17 Apr 2013 00:44:56 +0000 (00:44 +0000)]
Merge "Monitor the firewall rules file for changes" into jb-mr2-dev
Jamie Gennis [Tue, 16 Apr 2013 23:59:07 +0000 (16:59 -0700)]
am
95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev
* commit '
95a869f91bb9ab24300cec37037b0edcfa54f334':
Disable tracing from Zygote
Jamie Gennis [Tue, 16 Apr 2013 23:55:33 +0000 (23:55 +0000)]
Merge "Disable tracing from Zygote" into jb-mr2-dev
Philip Milne [Fri, 12 Apr 2013 21:38:34 +0000 (14:38 -0700)]
Fix for bug
8272673: GridLayout in battery details is cut off.
Change-Id: Iabcc2d2c486162cf88990eb1a25aca2e7558a57c
Fabrice Di Meglio [Tue, 16 Apr 2013 23:19:53 +0000 (16:19 -0700)]
am
09d0ee26: Merge "Fix bug #
8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev
* commit '
09d0ee261d11396e1541c23d8f4f3f5d7e6a9e18':
Fix bug #
8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
Fabrice Di Meglio [Tue, 16 Apr 2013 23:15:17 +0000 (23:15 +0000)]
Merge "Fix bug #
8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev
Fabrice Di Meglio [Tue, 16 Apr 2013 22:40:18 +0000 (15:40 -0700)]
Fix bug #
8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
- in AbsListView, force setScrollbarPosition() when RTL properties change
- in FastScroller, invalidate the correct rectangle when in RTL mode and in STATE_EXIT
Change-Id: Ie9fe4f826e179eb993e443d10e171b9dda3b6f3f
Jesse Hall [Tue, 16 Apr 2013 22:21:52 +0000 (15:21 -0700)]
am
c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev
* commit '
c7bdd50c97d874456d0408599c1a6145186167dd':
Unhide android.opengl.GLES30 class and contents
Jesse Hall [Tue, 16 Apr 2013 22:17:19 +0000 (22:17 +0000)]
Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev
Jamie Gennis [Tue, 16 Apr 2013 01:53:24 +0000 (18:53 -0700)]
Disable tracing from Zygote
This change disables all atrace tracing in Zygote immediately after it is
initialized. This is necessary because Zygote has no way to receive
notifications that the enabled trace tags have been changed. Tracing is
re-enabled when other processes fork from Zygote.
Change-Id: If2983858fb0c4890ba9ab041849b1c4d98f66c13
Chris Craik [Mon, 15 Apr 2013 23:08:28 +0000 (16:08 -0700)]
Make layer double drawing visible in overdraw debug mode
A clipped saveLayer will cause two draws - first to an onscreen
buffer, then again back to the framebuffer. This change - when in
overdraw debug - reissues draws associated with a clipped saveLayer,
but only to the stencil buffer. Operations within a saveLayer are
shown correctly to be twice drawn, and View.setAlpha() without an
associated hardware layer, or hasOverlappingRendering() are made more
visible.
Hardware layers, on any frame that they are updated, similarly draw
twice, and will also be counted against the stencil buffer doubly.
Note: greater depths of layers - e.g. a saveLayer within a saveLayer -
are not respected, as that would require additional region tracking.
Change-Id: I61fb0e61038fe66013d59914c20bb47a550dea7d
Irfan Sheriff [Tue, 16 Apr 2013 22:04:21 +0000 (15:04 -0700)]
am
d12a7645: Merge "Fix enabling networks after driver stop" into jb-mr2-dev
* commit '
d12a7645a3bf3ffa83b8041bf343f1dc12a2381f':
Fix enabling networks after driver stop
Irfan Sheriff [Tue, 16 Apr 2013 22:00:10 +0000 (22:00 +0000)]
Merge "Fix enabling networks after driver stop" into jb-mr2-dev
Svetoslav Ganov [Tue, 16 Apr 2013 21:45:38 +0000 (14:45 -0700)]
am
ad435ba7: Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev
* commit '
ad435ba7fff45b8a15ebda08f88767511935a5d7':
Send tab selection event from ScrollingTabContainerView.
Svetoslav Ganov [Tue, 16 Apr 2013 21:41:09 +0000 (21:41 +0000)]
Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev
Jesse Hall [Tue, 16 Apr 2013 21:35:40 +0000 (14:35 -0700)]
am
811d3734: Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev
* commit '
811d373444822b1a81cd6fb4f8ef87f6d49559b1':
Add android.opengl.GLES30, hidden for now
Jesse Hall [Tue, 16 Apr 2013 21:32:36 +0000 (21:32 +0000)]
Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev
Irfan Sheriff [Tue, 16 Apr 2013 20:52:32 +0000 (13:52 -0700)]
Fix enabling networks after driver stop
Bug:
8630194
Change-Id: If897fc1fe54bf2f35362b8482e56d98f80a3130c
Wink Saville [Tue, 16 Apr 2013 20:37:18 +0000 (13:37 -0700)]
am
c6f2d17a: Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev
* commit '
c6f2d17a0a6f9b172ff91247db12bc39a601f81c':
Add mHasQuit to fix an NPE in StateMachine.
Wink Saville [Tue, 16 Apr 2013 20:32:59 +0000 (20:32 +0000)]
Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev
Wink Saville [Tue, 16 Apr 2013 20:21:00 +0000 (13:21 -0700)]
Add mHasQuit to fix an NPE in StateMachine.
After quiting mStateStack and other variables become
null so ignore all messages.
Bug:
8627228
Change-Id: I60150fb8023340768b38c2e72a8cbc982a59e0a8
Jaikumar Ganesh [Tue, 16 Apr 2013 19:03:28 +0000 (12:03 -0700)]
am
37f58dcc: Merge "Fix wrong index value." into jb-mr2-dev
* commit '
37f58dccecd778f5af1f1f1db492c75ec5fcabd6':
Fix wrong index value.
Jaikumar Ganesh [Tue, 16 Apr 2013 18:59:31 +0000 (18:59 +0000)]
Merge "Fix wrong index value." into jb-mr2-dev
Jaikumar Ganesh [Tue, 16 Apr 2013 18:10:05 +0000 (11:10 -0700)]
Fix wrong index value.
Rotation vector was at the wrong index value.
b/
8165631
Change-Id: I50662befabf80393965c94a0335359019b98eb85
Daniel Sandler [Tue, 16 Apr 2013 18:35:48 +0000 (11:35 -0700)]
am
cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev
* commit '
cfd48d77a2d11324ce8641a9cc178fb9f12500a3':
Rebuild quick settings tile layouts.
Daniel Sandler [Tue, 16 Apr 2013 18:33:09 +0000 (18:33 +0000)]
Merge "Rebuild quick settings tile layouts." into jb-mr2-dev
Svetoslav [Tue, 16 Apr 2013 18:30:18 +0000 (11:30 -0700)]
am
8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev
* commit '
8297e68d84a6edc8ecb6d17d5ba2043075f921ff':
BinderDied may be called after we unregistered the death recipient.
Svetoslav [Tue, 16 Apr 2013 18:27:43 +0000 (18:27 +0000)]
Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev
Chet Haase [Tue, 16 Apr 2013 18:02:29 +0000 (11:02 -0700)]
am
b2488931: Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev
* commit '
b2488931cbd25c0e9dbc648882e272048c075741':
Avoid repositioning unattached overlay views
Chet Haase [Tue, 16 Apr 2013 17:58:36 +0000 (17:58 +0000)]
Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev
Victoria Lease [Mon, 15 Apr 2013 22:29:36 +0000 (15:29 -0700)]
use appropriate fallback chain for style
TextLayoutShaper was defaulting to the Regular-style fallback chain
for all unknown scripts. This became problematic in that the
codepoint->glyphID enumeration stage of shaping was always using the
Regular-style fallback chain for unknown scripts, and there's no
guarantee that glyph indices are compatible between fallback chains.
Defaulting to a style-appropriate fallback chain addresses this
issue, and probably unreported but related issues, as well.
Bug:
8189208
Change-Id: I6ecf531c74d71a8e4a5359d23439ccc950b0cf80
John Spurlock [Tue, 16 Apr 2013 13:26:51 +0000 (06:26 -0700)]
am
5584737f: Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev
* commit '
5584737fff6350ab09fb53e6a73bbff770930727':
FLAG_DISMISS_KEYGUARD should not hide status bar if secure.
John Spurlock [Tue, 16 Apr 2013 13:23:47 +0000 (13:23 +0000)]
Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev
Dirk Dougherty [Tue, 16 Apr 2013 05:03:10 +0000 (22:03 -0700)]
am
83d90b20: am
ce2c3de7: am
aac8d988: am
14ad06cf: am
25afd5d0: am
d1dc8c70: am
c6af49ef: Doc change: Add tablet basic checks.
* commit '
83d90b200babe43d5e91cef1bbcf0b224f48e16d':
Doc change: Add tablet basic checks.
Dirk Dougherty [Tue, 16 Apr 2013 04:59:53 +0000 (21:59 -0700)]
am
ce2c3de7: am
aac8d988: am
14ad06cf: am
25afd5d0: am
d1dc8c70: am
c6af49ef: Doc change: Add tablet basic checks.
* commit '
ce2c3de716dd77db8f1280f939312c36ebd297ea':
Doc change: Add tablet basic checks.
Dirk Dougherty [Tue, 16 Apr 2013 04:56:09 +0000 (21:56 -0700)]
am
aac8d988: am
14ad06cf: am
25afd5d0: am
d1dc8c70: am
c6af49ef: Doc change: Add tablet basic checks.
* commit '
aac8d988e1f1863e51d3296f09373c2939137e09':
Doc change: Add tablet basic checks.
Dirk Dougherty [Tue, 16 Apr 2013 04:52:26 +0000 (21:52 -0700)]
am
14ad06cf: am
25afd5d0: am
d1dc8c70: am
c6af49ef: Doc change: Add tablet basic checks.
* commit '
14ad06cf2fc4b78182f6df4b4ebaa78453b68ff4':
Doc change: Add tablet basic checks.
Dirk Dougherty [Tue, 16 Apr 2013 04:49:14 +0000 (21:49 -0700)]
am
25afd5d0: am
d1dc8c70: am
c6af49ef: Doc change: Add tablet basic checks.
* commit '
25afd5d063b7f6bcb0f5d6bf93ac1015a5a89869':
Doc change: Add tablet basic checks.
Dirk Dougherty [Tue, 16 Apr 2013 04:46:52 +0000 (21:46 -0700)]
am
d1dc8c70: am
c6af49ef: Doc change: Add tablet basic checks.
* commit '
d1dc8c70786fdeae1c0de39d4ded896663588203':
Doc change: Add tablet basic checks.
Dirk Dougherty [Tue, 16 Apr 2013 04:43:56 +0000 (21:43 -0700)]
am
c6af49ef: Doc change: Add tablet basic checks.
* commit '
c6af49efc467e379e7ac56246e9c7f0e6ebddc00':
Doc change: Add tablet basic checks.
Dirk Dougherty [Mon, 1 Apr 2013 19:10:14 +0000 (12:10 -0700)]
Doc change: Add tablet basic checks.
Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d
Stan Chesnutt [Tue, 16 Apr 2013 02:52:52 +0000 (19:52 -0700)]
am
b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev
* commit '
b34b3211e01b0ae946f786b220f73d340159503b':
Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
Stan Chesnutt [Tue, 16 Apr 2013 02:49:45 +0000 (02:49 +0000)]
Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev
Stan Chesnutt [Tue, 16 Apr 2013 02:18:02 +0000 (19:18 -0700)]
Re-introduce single-shot mode, set MS Assist Mode A when in
single-shot mode.
Fixes bug http://b.corp.google.com/issue?id=
8204392
Change-Id: I5594447c75abab6b71bd12706409666bb75736c5
Daniel Sandler [Fri, 12 Apr 2013 19:16:53 +0000 (15:16 -0400)]
Rebuild quick settings tile layouts.
The chief motivation here is to allow two lines of text when
necessary. So much refactoring over so small a thing, but
the result is satisfying: most quick settings tiles do not
need their own layouts. Additionally, tiles with odd-shaped
icons (I'm looking at you, alien potato mode) no longer fall
off the grid.
It should be possible to further reduce the complexity of
quick settings, but for now this will suffice.
Bug:
7216734 // vertical alignment issues
Bug:
7216868 // wrap text in QS tiles
Bug:
7365911 // NPE in some tiles
Change-Id: I0c6ef275e44f745dfac52c2a7303072ae48e3873
Daniel Sandler [Tue, 16 Apr 2013 01:48:06 +0000 (18:48 -0700)]
am
4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev
* commit '
4b6d23d7b45f813bee52747b3243ce46ff9edbd0':
Further reduce memory usage of notification archive.
Daniel Sandler [Tue, 16 Apr 2013 01:44:11 +0000 (01:44 +0000)]
Merge "Further reduce memory usage of notification archive." into jb-mr2-dev
Daniel Sandler [Tue, 16 Apr 2013 00:57:02 +0000 (20:57 -0400)]
Further reduce memory usage of notification archive.
- Max 250 notifications preserved (was 1000)
- Known heavyweight extras are removed
- print some of 'em out in dumpstate, while we're at it
Bug:
8280039
Bug:
8537938
Change-Id: I9239128c32a1d9f5ef4e0dc62dc2d23e190871e9
Daniel Sandler [Tue, 16 Apr 2013 01:42:33 +0000 (18:42 -0700)]
am
f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev
* commit '
f094d221e53e2359f886ae3d601c490ade70443e':
Finish annotating Notification.extras.
Daniel Sandler [Tue, 16 Apr 2013 01:38:54 +0000 (01:38 +0000)]
Merge "Finish annotating Notification.extras." into jb-mr2-dev
Jesse Hall [Thu, 11 Apr 2013 05:52:36 +0000 (22:52 -0700)]
Unhide android.opengl.GLES30 class and contents
Bug:
8566953
Change-Id: I5273fb3bff642da5ff1eecb5899e8051402b19ca
Jesse Hall [Fri, 29 Mar 2013 18:02:35 +0000 (11:02 -0700)]
Add android.opengl.GLES30, hidden for now
Bug:
8566953
Change-Id: Ia5a01d5e857b4fce12a451e2dcab0359758ad648
Kristian Monsen [Mon, 15 Apr 2013 23:58:53 +0000 (16:58 -0700)]
am
639857f7: Merge "Fix for bug
8607049: Improve javascript dialogs for classic" into jb-mr2-dev
* commit '
639857f7f42bb048b1dd8fbc4849e7b51402f629':
Fix for bug
8607049: Improve javascript dialogs for classic
Kristian Monsen [Mon, 15 Apr 2013 23:54:43 +0000 (23:54 +0000)]
Merge "Fix for bug
8607049: Improve javascript dialogs for classic" into jb-mr2-dev
Kenny Root [Mon, 15 Apr 2013 23:40:04 +0000 (16:40 -0700)]
resolved conflicts for merge of
6a67a38f to jb-mr2-dev-plus-aosp
David Christie [Mon, 15 Apr 2013 23:39:08 +0000 (16:39 -0700)]
am
feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev
* commit '
feedb1b095f94e4bd153aeee78da07d963892071':
Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
David Christie [Mon, 15 Apr 2013 23:35:43 +0000 (23:35 +0000)]
Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev
Svetoslav [Mon, 15 Apr 2013 23:26:39 +0000 (16:26 -0700)]
BinderDied may be called after we unregistered the death recipient.
It is possible that an accessibility service's package was force stopped
during whose handling the death recipient is unlinked and still get a call
on binderDied since the call was made before we unlink but was waiting on
the lock we held during the force stop handling. Added a check whether the
service is already disconnected and if so do nothing.
bug:
8600388
Change-Id: I4a9ca305b9863d986b930a7c1ec8f9006b16a333
Dianne Hackborn [Mon, 15 Apr 2013 23:25:08 +0000 (16:25 -0700)]
am
0985ac04: Merge "Maybe fix issue #
8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev
* commit '
0985ac04310f18be7dd814b9a07c93f144ad21c2':
Maybe fix issue #
8620910: Win_sdk build failed and unable to create...
Dianne Hackborn [Mon, 15 Apr 2013 23:25:05 +0000 (16:25 -0700)]
am
a59a19ab: Merge "Fix issue #
8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev
* commit '
a59a19abb8f284beb478ff2492493251b91a2847':
Fix issue #
8512015: VideoView's window animates when its position changes
Dianne Hackborn [Mon, 15 Apr 2013 23:23:31 +0000 (23:23 +0000)]
Merge "Maybe fix issue #
8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev
Dianne Hackborn [Mon, 15 Apr 2013 23:22:48 +0000 (23:22 +0000)]
Merge "Fix issue #
8512015: VideoView's window animates when its position changes" into jb-mr2-dev
Alan Viverette [Mon, 15 Apr 2013 23:16:11 +0000 (16:16 -0700)]
Send tab selection event from ScrollingTabContainerView.
BUG:
8185409
Change-Id: I37c59906d2950d09e0e39ca91ffad34279dd9526
Geremy Condra [Mon, 15 Apr 2013 23:13:56 +0000 (16:13 -0700)]
am
bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev
* commit '
bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
Add logic to handle changes to file_contexts during update.
Geremy Condra [Mon, 15 Apr 2013 23:11:12 +0000 (23:11 +0000)]
Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev
Irfan Sheriff [Mon, 15 Apr 2013 22:57:32 +0000 (15:57 -0700)]
am
ed8cdbb7: Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev
* commit '
ed8cdbb780cda3701b433dd1d383bb88f180ff72':
Fix CTS failure due to invalid EAP update
Dirk Dougherty [Mon, 15 Apr 2013 22:57:29 +0000 (15:57 -0700)]
am
9fbc8f70: am
edf2ab16: am
b345693f: am
5a9c5b67: am
b02d529a: am
6859939f: am
99a79e80: Doc change: add policy guidelines documents.
* commit '
9fbc8f70b6ccdecc95c968ecdb9f8f823bd92857':
Doc change: add policy guidelines documents.
Irfan Sheriff [Mon, 15 Apr 2013 22:52:33 +0000 (22:52 +0000)]
Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev
Dirk Dougherty [Mon, 15 Apr 2013 22:51:25 +0000 (15:51 -0700)]
am
edf2ab16: am
b345693f: am
5a9c5b67: am
b02d529a: am
6859939f: am
99a79e80: Doc change: add policy guidelines documents.
* commit '
edf2ab16fe011667dbae8c6c351bd3ac36958326':
Doc change: add policy guidelines documents.
Dirk Dougherty [Mon, 15 Apr 2013 22:47:11 +0000 (15:47 -0700)]
am
b345693f: am
5a9c5b67: am
b02d529a: am
6859939f: am
99a79e80: Doc change: add policy guidelines documents.
* commit '
b345693f0ff0705ba1eedd3b49c21d14dc78c6b6':
Doc change: add policy guidelines documents.
Dirk Dougherty [Mon, 15 Apr 2013 22:44:46 +0000 (15:44 -0700)]
am
5a9c5b67: am
b02d529a: am
6859939f: am
99a79e80: Doc change: add policy guidelines documents.
* commit '
5a9c5b67ca6d8c35bb4522bd0618bf50f246f7ef':
Doc change: add policy guidelines documents.
Kenny Root [Mon, 15 Apr 2013 22:44:41 +0000 (22:44 +0000)]
Merge "AndroidKeyStore: Add encrypted flag"
Dirk Dougherty [Mon, 15 Apr 2013 22:41:56 +0000 (15:41 -0700)]
am
b02d529a: am
6859939f: am
99a79e80: Doc change: add policy guidelines documents.
* commit '
b02d529a2faaca629e7c51e4c4ccd7fe34ddb376':
Doc change: add policy guidelines documents.
Dirk Dougherty [Mon, 15 Apr 2013 22:37:56 +0000 (15:37 -0700)]
am
6859939f: am
99a79e80: Doc change: add policy guidelines documents.
* commit '
6859939fe88de8b42117a3d0798dccb0c594e568':
Doc change: add policy guidelines documents.
Dianne Hackborn [Mon, 15 Apr 2013 22:36:53 +0000 (15:36 -0700)]
Maybe fix issue #
8620910: Win_sdk build failed and unable to create...
...the sdk platform repo
Change-Id: Ib6cd7c0dfb9b6217ae79af3e2ac25fe0442996e3
Irfan Sheriff [Mon, 15 Apr 2013 22:26:01 +0000 (15:26 -0700)]
Fix CTS failure due to invalid EAP update
Update EAP only when it has valid entry
Bug:
8604987
Change-Id: Ib6b10bd06c26ee91c4ecd3a231b509d728725dfc
Dirk Dougherty [Mon, 15 Apr 2013 22:34:08 +0000 (15:34 -0700)]
am
99a79e80: Doc change: add policy guidelines documents.
* commit '
99a79e807b4bab154c9904a05d05dda4b420206a':
Doc change: add policy guidelines documents.
David Christie [Mon, 15 Apr 2013 22:31:11 +0000 (15:31 -0700)]
Fix security issues with LocationManager where apps with coarse permissions
can get location updates too frequently by repeatedly calling getLastKnownLocation
or by registering/unregistering location updates frequently.
Change-Id: Ibd9ce28b0401372b995a0dbfb2f0a984dd11c0b1
Kenny Root [Mon, 15 Apr 2013 22:30:05 +0000 (15:30 -0700)]
am
2570d0ad: Merge "keystore: remove old APIs" into jb-mr2-dev
* commit '
2570d0ada876b94a91f9665c7469140ba0ddc712':
keystore: remove old APIs
Kenny Root [Mon, 15 Apr 2013 22:25:21 +0000 (22:25 +0000)]
Merge "keystore: remove old APIs" into jb-mr2-dev
Chet Haase [Mon, 15 Apr 2013 22:15:59 +0000 (15:15 -0700)]
Avoid repositioning unattached overlay views
Adding a view to an overlay usually entails removing the
view from its current parent, if it has one. ViewOverlay.add() will
do this automatically. At the same time, it will check to see whether
the parent view is in a different global location than the overlay's
host view, and will adjust the added view accordingly. This enables
the caller to simply toss a view into an overlay and have it end up
at the same global position on the screen.
the problem is that the current code doesn't bother to check whether
the old parent is attached. If that parent has been removed from the
view hierarchy before this overlay operation, then it will show up as
being at (0,0) in the window, not its old location. This results in the
view being mis-positioned in the overaly.
Fix is simple: if the view's old parent is not attached, simply remove
it from that parent before adding it to the overlay; don't try to compensate
for its position which is based on wrong information.
Issue #
8620319 Overlay should only use relative window locations for onscreen parents
Change-Id: I414038a6c355dfd58f9766b007ac44d535ef1889
Dianne Hackborn [Mon, 15 Apr 2013 22:07:21 +0000 (15:07 -0700)]
Fix issue #
8512015: VideoView's window animates when its position changes
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b