OSDN Git Service
Selim Gurun [Thu, 12 Sep 2013 01:02:45 +0000 (01:02 +0000)]
Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev
Selim Gurun [Thu, 12 Sep 2013 00:57:34 +0000 (00:57 +0000)]
Revert "Add permissions for the InCallUI Split."
This reverts commit
4f7ffa90d117e499786c77bccefdef88c1714668.
Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
Alex Ray [Thu, 12 Sep 2013 00:40:50 +0000 (00:40 +0000)]
Merge "consumer ir: clarify @link in documentation" into klp-dev
Xia Wang [Thu, 12 Sep 2013 00:24:31 +0000 (00:24 +0000)]
Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev
Lajos Molnar [Thu, 12 Sep 2013 00:19:17 +0000 (00:19 +0000)]
Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev
Eric Laurent [Thu, 12 Sep 2013 00:15:30 +0000 (00:15 +0000)]
Merge "Add HOTWORD as an AudioSource" into klp-dev
Eino-Ville Talvala [Thu, 12 Sep 2013 00:08:04 +0000 (00:08 +0000)]
Merge changes Ia6300c23,Idd2ae8ad into klp-dev
* changes:
Camera2: Immutable metadata
Camera2: Listener rework and other API updates
Ruben Brunk [Thu, 12 Sep 2013 00:01:28 +0000 (00:01 +0000)]
Merge "Remove dependency on JNIHelp header side effects." into klp-dev
Amith Yamasani [Wed, 11 Sep 2013 23:56:43 +0000 (23:56 +0000)]
Merge "Change selection highlight for intent disambig dialog" into klp-dev
Chong Zhang [Wed, 11 Sep 2013 23:51:44 +0000 (23:51 +0000)]
Merge "Pass subtitle track properties to SubtitleController" into klp-dev
Mindy Pereira [Wed, 11 Sep 2013 23:33:02 +0000 (23:33 +0000)]
Merge "Scale feels too quick in relation to movement" into klp-dev
Alex Ray [Wed, 11 Sep 2013 21:34:25 +0000 (14:34 -0700)]
consumer ir: clarify @link in documentation
Change-Id: Ifebd0b550f5d9860697539646596a0b1cc782949
Kenny Root [Wed, 11 Sep 2013 22:37:02 +0000 (22:37 +0000)]
Merge "Fix another off-by-one error in ZipFileRO" into klp-dev
Kenny Root [Wed, 11 Sep 2013 22:28:39 +0000 (15:28 -0700)]
Fix another off-by-one error in ZipFileRO
Bug:
10424836
Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807
Chong Zhang [Wed, 11 Sep 2013 20:41:00 +0000 (13:41 -0700)]
Pass subtitle track properties to SubtitleController
Bug:
10326117
Change-Id: I387406adf3e1bd835b031dd5fbd2e1cdeaf2fe87
Xia Wang [Wed, 11 Sep 2013 01:28:16 +0000 (18:28 -0700)]
Use setAirplaneMode() API for Connectivity Manager tests
Change-Id: I2e35c58e4101b6b5fe9efdb5adad922402d38b6f
Zhijun He [Wed, 11 Sep 2013 21:31:54 +0000 (21:31 +0000)]
Merge "ImageReader: Skip size check for BLOB format" into klp-dev
destradaa [Wed, 11 Sep 2013 21:15:34 +0000 (21:15 +0000)]
Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev
Adam Powell [Wed, 11 Sep 2013 20:38:40 +0000 (20:38 +0000)]
Merge "Action bar refactoring and transitions" into klp-dev
Eino-Ville Talvala [Tue, 27 Aug 2013 19:09:04 +0000 (12:09 -0700)]
Camera2: Immutable metadata
Make all camera metadata immutable once created; requests are
created using CameraRequest.Builder.
- Separate CameraMetadata implementation from interface
- Implement deep copying of metadata
- Requests/results/properties have-a native implementation
Bug:
10360518
Change-Id: Ia6300c237219d39f70c63156fa9ca666d951a36e
Zhijun He [Wed, 11 Sep 2013 00:50:34 +0000 (17:50 -0700)]
ImageReader: Skip size check for BLOB format
HAL_PIXEL_FORMAT_BLOB is for JPEG capture, the buffer width/height by definition
shouldn't be the same as the image width/height.
Bug:
10360518
Change-Id: I32146a0e8e15439bb8fe199403db4ff37d1ab1af
Jeff Sharkey [Wed, 11 Sep 2013 20:16:59 +0000 (20:16 +0000)]
Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes:
Fix SDK build.
Request all tethering interfaces, fix corruption.
Amith Yamasani [Wed, 11 Sep 2013 20:06:23 +0000 (13:06 -0700)]
Change selection highlight for intent disambig dialog
Use standard selection/activation highlights
Bug:
10529505
Change-Id: I81bc0a1a799f93dd6595d38c1a42d6d316e0d61a
Kenny Root [Wed, 11 Sep 2013 19:47:12 +0000 (19:47 +0000)]
Merge "Reconcile differences between zip implementations" into klp-dev
destradaa [Wed, 11 Sep 2013 19:42:51 +0000 (12:42 -0700)]
Fix exceptions in the Flp Hal layer:
- JNI exception accessing a geofence method with wrong signature
- FlpHardwareProvider exception when the monitoring status contains no location information
Bug:
10691492
Change-Id: I1959712912af712dc9dc344f20afd1112da46efc
Eino-Ville Talvala [Wed, 14 Aug 2013 17:35:46 +0000 (10:35 -0700)]
Camera2: Listener rework and other API updates
- Add Handlers to each callback-accepting function
- Expand CameraDevice ErrorListener to CameraDeviceListener
- Add idle callback
- Split out disconnect error to its own callback
- Add CameraDevice#getId
- Rename CameraManager's listener to AvailabilityListener
- Rename CameraManager register/unregister*Listener to
add/remove*Listener
- Rename getDeviceIdList to getCameraIdList
Bug:
10549567
Bug:
10549462
Change-Id: Idd2ae8ad8eb126f35a15d765306ada7c1cf74eea
Tom O'Neill [Wed, 11 Sep 2013 19:20:15 +0000 (19:20 +0000)]
Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev
Santos Cordon [Wed, 11 Sep 2013 19:08:33 +0000 (19:08 +0000)]
Merge "Add permissions for the InCallUI Split." into klp-dev
Alexander Ray [Wed, 11 Sep 2013 19:05:37 +0000 (19:05 +0000)]
Merge "Add consumer IR framework" into klp-dev
Sandeep Siddhartha [Wed, 11 Sep 2013 19:01:51 +0000 (19:01 +0000)]
Merge "Remove HotwordRecognition APIs" into klp-dev
Kenny Root [Wed, 21 Aug 2013 17:40:16 +0000 (10:40 -0700)]
Reconcile differences between zip implementations
Reconcile the difference between ZipFileRO and java.util.ZipFile to have
the same behavior.
Bug:
10424836
Change-Id: I6bde1bad7e20065ee650945fd43a913c05ce5ac7
Igor Murashkin [Wed, 11 Sep 2013 18:27:59 +0000 (18:27 +0000)]
Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev
Victoria Lease [Wed, 11 Sep 2013 18:28:00 +0000 (18:28 +0000)]
Merge "include Padauk in fallback chain" into klp-dev
Amith Yamasani [Wed, 11 Sep 2013 18:27:53 +0000 (18:27 +0000)]
Merge "Handle the case where the restore environment doesn't have the ringtone" into klp-dev
Dianne Hackborn [Wed, 11 Sep 2013 18:13:17 +0000 (18:13 +0000)]
Merge "More on issue #
10130785: Restore silence and vibrate settings..." into klp-dev
Kenny Root [Wed, 11 Sep 2013 18:11:34 +0000 (18:11 +0000)]
Merge "Revert "Reconcile differences between zip implementations"" into klp-dev
Amith Yamasani [Wed, 11 Sep 2013 18:11:19 +0000 (11:11 -0700)]
Handle the case where the restore environment doesn't have the ringtone
Bug:
10130785
uncanonicalize() can return a null now, so abort restoring the ringtone
in that case.
Change-Id: I28765818c8d3e1fb3f271afdfe66ebc955cfcefe
Kenny Root [Wed, 11 Sep 2013 18:10:09 +0000 (18:10 +0000)]
Revert "Reconcile differences between zip implementations"
This reverts commit
9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.
Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
Dianne Hackborn [Wed, 11 Sep 2013 18:02:24 +0000 (11:02 -0700)]
More on issue #
10130785: Restore silence and vibrate settings...
...in settings > sound
ContentResolver.uncanonicalize needs to be able to fail.
Change-Id: I347ef60fc3619aae203b87079579597c60be8b90
Tom O'Neill [Wed, 11 Sep 2013 18:03:03 +0000 (11:03 -0700)]
Improve some javadoc related to isProviderEnabled() apis
- LocationManager.isProviderEnabled() no longer throws SecurityException:
the caller could already circumvent the permission check by calling
Secure.isLocationProviderEnabled()
Change-Id: I5abd04264299671ed35ce4594b5be46d86378767
Sandeep Siddhartha [Wed, 11 Sep 2013 16:48:00 +0000 (09:48 -0700)]
Remove HotwordRecognition APIs
- and its usage from Keyguard
Bug:
10708010
Change-Id: Ic4a695a1d0e9312706a3b4ff01e59e2567b6ad9c
Jonathan Dixon [Wed, 11 Sep 2013 17:59:42 +0000 (17:59 +0000)]
Merge "Preparation for deleting WebViewClassic" into klp-dev
Martijn Coenen [Wed, 11 Sep 2013 17:52:18 +0000 (17:52 +0000)]
Merge "Add support for loading banners from HCE services." into klp-dev
Dianne Hackborn [Wed, 11 Sep 2013 17:46:13 +0000 (17:46 +0000)]
Merge "Fix issue #
10688644: Java crash in com.android.phone:" into klp-dev
Adam Skory [Wed, 11 Sep 2013 17:44:14 +0000 (17:44 +0000)]
Merge "Fix bad references in preloaded-classes" into klp-dev
Chris Craik [Wed, 11 Sep 2013 17:40:39 +0000 (17:40 +0000)]
Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev
Kenny Root [Wed, 11 Sep 2013 17:38:26 +0000 (17:38 +0000)]
Merge "Reconcile differences between zip implementations" into klp-dev
Adam Skory [Wed, 11 Sep 2013 17:06:25 +0000 (18:06 +0100)]
Fix bad references in preloaded-classes
http://ag/352924 renamed INdefPushCallback
to IAppCallback. Update preloaded-classes
to reflect this.
This is a cherry-pick of Id552e94e3a01cdd61593480f3c0aedb32d185f80
Change-Id: I0901f14fb41f94e3c7572c09e090ec5903a878d1
Yuhao Zheng [Wed, 11 Sep 2013 17:35:09 +0000 (17:35 +0000)]
Merge "Fix for the toggle airplane mode hidden API" into klp-dev
quddusc [Wed, 11 Sep 2013 17:17:41 +0000 (10:17 -0700)]
am
eacfc308: am
a0b259a9: am
161e423e: Merge "docs: Fixed deprecated value. Bug:
10641906" into jb-mr2-docs
* commit '
eacfc308344b34d27b7cd2ab8cc0fbdefbcc8167':
docs: Fixed deprecated value. Bug:
10641906
quddusc [Wed, 11 Sep 2013 17:15:12 +0000 (10:15 -0700)]
am
a0b259a9: am
161e423e: Merge "docs: Fixed deprecated value. Bug:
10641906" into jb-mr2-docs
* commit '
a0b259a917f9c7cf73b4e8ceab104cdab4383c24':
docs: Fixed deprecated value. Bug:
10641906
quddusc [Wed, 11 Sep 2013 17:09:45 +0000 (10:09 -0700)]
am
161e423e: Merge "docs: Fixed deprecated value. Bug:
10641906" into jb-mr2-docs
* commit '
161e423ead0e2272ebb0b73957abf0c916ad57ff':
docs: Fixed deprecated value. Bug:
10641906
Dianne Hackborn [Wed, 11 Sep 2013 16:51:14 +0000 (09:51 -0700)]
Fix issue #
10688644: Java crash in com.android.phone:
java.lang.SecurityException: Operation not allowed
There was a situation I wasn't taking into account -- components
declared by the system has a special ability to run in the processes
of other uids. This means that if that code loaded into another
process tries to do anything needing an app op verification, it will
fail, because it will say it is calling as the system package name but
it is not actually coming from the system uid.
To fix this, we add a new Context.getOpPackageName() to go along-side
getBasePackageName(). This is a special call for use by all app ops
verification, which will be initialized with either the base package
name, the actual package name, or now the default package name of the
process if we are creating a context for system code being loaded into
a non-system process.
I had to update all of the code doing app ops checks to switch to this
method to get the calling package name.
Also improve the security exception throw to have a more descriptive
error message.
Change-Id: Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25
Erik Gilling [Wed, 26 Jun 2013 18:06:51 +0000 (11:06 -0700)]
Add consumer IR framework
Change-Id: I786c00db0cce61ef75e4edc24e90f2cdcba6dbfb
Victoria Lease [Fri, 6 Sep 2013 21:04:18 +0000 (14:04 -0700)]
include Padauk in fallback chain
Bug:
10625246
Change-Id: I32530a992beeafe2ee16da36f0dc0a752c647cc6
(cherry picked from commit
5d34e4d679e6237b0d075177d1e365161c684445)
Conflicts:
data/fonts/fallback_fonts.xml
Yuhao Zheng [Wed, 11 Sep 2013 16:36:41 +0000 (09:36 -0700)]
Fix for the toggle airplane mode hidden API
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:
10653570
Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90
Jeff Sharkey [Wed, 11 Sep 2013 16:14:16 +0000 (09:14 -0700)]
Fix SDK build.
Change-Id: Ib12748478cb1b42621454ab2035fb8f3163b6ac8
John Spurlock [Wed, 11 Sep 2013 14:50:08 +0000 (14:50 +0000)]
Merge "Add activity indicator icons to quick settings tiles." into klp-dev
Chet Haase [Wed, 11 Sep 2013 14:14:06 +0000 (14:14 +0000)]
Merge "Build layer immediately when setting it in ViewPropertyAnimator" into klp-dev
Chet Haase [Wed, 11 Sep 2013 14:13:48 +0000 (14:13 +0000)]
Merge "Reversing immediately after starting animator ends it" into klp-dev
John Spurlock [Thu, 5 Sep 2013 20:50:21 +0000 (16:50 -0400)]
Add activity indicator icons to quick settings tiles.
Wifi + RSSI now have activity in / activity out indicators
wired up to information coming from NetworkController.
Bug:
10634208
Change-Id: I3cf29dc905eeaeb4aea8e7df4fe46e70645e0013
Daniel Sandler [Wed, 11 Sep 2013 13:51:19 +0000 (13:51 +0000)]
Merge "New orange color for status bar + qs assets." into klp-dev
John Spurlock [Wed, 11 Sep 2013 13:28:49 +0000 (09:28 -0400)]
Don't rely on window state when disabling the panel.
Bug:
10488453
Change-Id: I09ffbf166dd34489064cf0d73fe7ae4dd356c6c9
John Spurlock [Wed, 11 Sep 2013 12:27:18 +0000 (08:27 -0400)]
New orange color for status bar + qs assets.
Bug:
10502089
Change-Id: I7b43fe260ceccba29f896009ce467fe29ec67f64
Adam Skory [Wed, 11 Sep 2013 11:27:50 +0000 (11:27 +0000)]
Merge "Revert services assist context in KitKat" into klp-dev
Adam Skory [Wed, 11 Sep 2013 11:04:58 +0000 (12:04 +0100)]
Revert services assist context in KitKat
Reverts extension to assist context API to query
foreground services for assist context data.
Also hides Intent.ACTION_VOICE_ASSIST because
nobody's actually using it yet.
Bug:
10461702
Change-Id: Idf6836adc659b434e11ebb2b98e8b814c94a7227
Marc Wilson [Wed, 11 Sep 2013 10:50:34 +0000 (10:50 +0000)]
Merge "Update documentation for speech APIs." into klp-dev
Martijn Coenen [Fri, 6 Sep 2013 04:05:53 +0000 (21:05 -0700)]
Add support for loading banners from HCE services.
Bug:
10262585
Change-Id: I08f06ce92dd9071dc8ad1390ce9a4b877b05827d
Jeff Sharkey [Wed, 11 Sep 2013 04:18:13 +0000 (04:18 +0000)]
Merge "More tweaks to match UX spec." into klp-dev
Jeff Sharkey [Wed, 11 Sep 2013 04:03:27 +0000 (21:03 -0700)]
Request all tethering interfaces, fix corruption.
netd now tracks statistics for tethered interfaces across tethering
sessions, so switch to asking for all tethering stats. (Currently
we're double-counting all tethering data, ever since it started
tracking across sessions.)
Also catch OOME to handle corrupt stats files, which we then dump to
DropBox and then start over.
Bug:
5868832,
9796109
Change-Id: I2eb2a1bf01b993dd198597d770fe0e022466c6b9
Ruben Brunk [Tue, 10 Sep 2013 00:44:59 +0000 (17:44 -0700)]
Remove dependency on JNIHelp header side effects.
Bug:
10680559
Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
Jeff Sharkey [Wed, 11 Sep 2013 00:56:39 +0000 (17:56 -0700)]
More tweaks to match UX spec.
Fixed text colors to match spec. Behold The Greyening! Centered
loader spinner in grid mode. Show multiple lines in status messages.
Add string descriptions. Fix bug where toggling size setting didn't
kick a UI rebind.
Bug:
10510022
Change-Id: Icb41ebeb4de0fed8c04fc6cf5213af1587b72641
Chris Craik [Wed, 11 Sep 2013 00:18:04 +0000 (17:18 -0700)]
Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref
bug:
10691404
Only ref the wrapped pixel refs, so that they are the single source of
correct refcount, since the wrapping pixel ref can change out from
underneath an SkBitmap.
Change-Id: I253b8737d2afdcc567a26725fa40b1d9ef0e6a92
Adam Powell [Wed, 19 Jun 2013 18:33:28 +0000 (11:33 -0700)]
Action bar refactoring and transitions
* Remove the extra occurrence of the Up caret view and reuse the
standard home view.
* Use new transition APIs to animate changes in action bar content.
Change-Id: I7af3bb580ef4bff7d8dec9e21649b856fe73c77b
Eric Laurent [Mon, 9 Sep 2013 17:31:59 +0000 (10:31 -0700)]
Add HOTWORD as an AudioSource
- This is a low-priority source that can be preempted by others
- This is required for scenarios where someone wants an alway-on
graceful microphone
Bug:
10640877.
Change-Id: Idb3577541103717cb713a7a93d3762ad2c2f4710
Jeff Brown [Wed, 11 Sep 2013 00:35:39 +0000 (00:35 +0000)]
Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev
Kenny Root [Wed, 21 Aug 2013 17:40:16 +0000 (10:40 -0700)]
Reconcile differences between zip implementations
Reconcile the difference between ZipFileRO and java.util.ZipFile to have
the same behavior.
Bug:
10424836
Change-Id: Iff159c9e1a91b59f6c5346dc0278cb9e4bbc1a39
Jeff Brown [Wed, 11 Sep 2013 00:13:28 +0000 (17:13 -0700)]
WirelessChargerDetector: Work around bad sensor timestamps.
It turns out that on some devices the sensor event timestamp
may be non-monotonic. This may cause the detector to hold
a wakelock indefinitely if the time jumps backwards. These
timestamps are not well tested in general so there may be
other artifacts as well. Use elapsed realtime instead.
Bug:
9926451
Change-Id: Idb0b316e22b23aac86837bd25b953daf49f9b758
Jeff Sharkey [Wed, 11 Sep 2013 00:07:42 +0000 (00:07 +0000)]
Merge "Include system packages in packages.list." into klp-dev
Chet Haase [Wed, 11 Sep 2013 00:05:44 +0000 (17:05 -0700)]
Build layer immediately when setting it in ViewPropertyAnimator
Previously, withLayer() would simply set the layer type in the runnable
called in onAnimationStart(). Now we also call buildLayer(), to get it
out of the way prior to the view drawing for the first time after the
animation begins.
Issue #
9422420 ViewPropertyAnimator.withLayer() should build layer immediately
Change-Id: I99923a234f7ca1ec0b6f1b0bf28b62a71ab7eb4d
Amith Yamasani [Wed, 11 Sep 2013 00:03:50 +0000 (00:03 +0000)]
Merge "Backup and restore ringtone and notification ringtone" into klp-dev
Jeff Sharkey [Tue, 10 Sep 2013 23:59:43 +0000 (23:59 +0000)]
Merge "More UX work for thumbnails, search, management." into klp-dev
Jeff Sharkey [Tue, 10 Sep 2013 23:57:24 +0000 (16:57 -0700)]
Include system packages in packages.list.
This provides group membership to the FUSE daemon, since system
packages like NFC and Bluetooth hold sdcard_rw.
Bug:
10610659
Change-Id: I7428e999cfa4087ffe220b9d8bd80827191ab997
Jeff Brown [Tue, 10 Sep 2013 23:52:53 +0000 (23:52 +0000)]
Merge "Propagate input ANR reason to activity manager log." into klp-dev
Jeff Brown [Tue, 10 Sep 2013 23:44:24 +0000 (16:44 -0700)]
Propagate input ANR reason to activity manager log.
Make it a little easier to diagnose input dispatch timeouts by
providing the detailed reason as the ANR annotation in the log.
Bug:
10689184
Change-Id: Ie18fd9ad066b0673d1f57c030e027ad0085f4650
Jeff Sharkey [Tue, 10 Sep 2013 19:04:26 +0000 (12:04 -0700)]
More UX work for thumbnails, search, management.
Hide non-finished downloads from normal picker UI, but keep them
around in management mode. Uses a Uri query parameter and a hidden
API on DocumentsProvider.
Scale thumbnails to fit viewport, always show MIME icon while waiting
on thumbnails, and crossfade between them. Cancel thumbnail tasks
when views are recycled.
Filter directories out of search results for now. Also leave sort
ordering from backend intact, since it's custom ranking. Fix
SearchView interaction to dismiss properly and restore across
orientation and drawer state changes.
Hide most actions when drawer is open. Invalidate RootInfo cache
when locale changes. Apply sort ordering when showing recent create
directories. Hide recent summary string when icon is enough for user
to disambiguate.
Bug:
10667184,
10665663
Change-Id: I331d3272a08c497f88dc659d9e112231cb35aa69
Yorke Lee [Tue, 10 Sep 2013 23:25:14 +0000 (23:25 +0000)]
Merge "Update javadocs for number presentation" into klp-dev
Yorke Lee [Tue, 10 Sep 2013 21:39:24 +0000 (14:39 -0700)]
Update javadocs for number presentation
Bug:
10461762
Change-Id: Idfd19fb5f522569afa775ce95e0ba975324a0ee2
Craig Mautner [Tue, 10 Sep 2013 22:11:57 +0000 (22:11 +0000)]
Merge "When waiting for activity to finish don't reset" into klp-dev
John Reck [Tue, 10 Sep 2013 21:03:48 +0000 (21:03 +0000)]
Merge "Fix scissor for functor invocation" into klp-dev
Tim Murray [Tue, 10 Sep 2013 21:00:37 +0000 (21:00 +0000)]
Merge "Fix FontRenderer bug." into klp-dev
Tim Murray [Tue, 10 Sep 2013 20:46:49 +0000 (13:46 -0700)]
Fix FontRenderer bug.
bug
10691313
Change-Id: Icd5341a3c2066e337911f040ddc935c48c8d7cd1
John Reck [Tue, 10 Sep 2013 20:12:09 +0000 (13:12 -0700)]
Fix scissor for functor invocation
Bug:
10677765
enableScissor() must precede setScissorFromClip() as
otherwise setScissorFromClip() doesn't do anything.
Also make sure to call setScissorFromClip() if
enableScissor() returns true as enableScissor() calls
resetScissor() if the scissor state has changed.
Change-Id: I9226b20bb256c92066aae344e4e6407540b6eae9
David Braun [Tue, 10 Sep 2013 20:33:27 +0000 (20:33 +0000)]
Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
Jason Monk [Tue, 10 Sep 2013 20:27:23 +0000 (20:27 +0000)]
Merge "Verify inputs to PAC resolving." into klp-dev
David Braun [Tue, 10 Sep 2013 20:14:46 +0000 (13:14 -0700)]
Factor out read/write SMS settings seperate from send/receive.
Change-Id: I161782b1508be433c910ec13c0b18e728bf7d2ba
Alan Viverette [Tue, 10 Sep 2013 20:05:59 +0000 (20:05 +0000)]
Merge "Make ListView's illegal state exception more helpful" into klp-dev
Zhijun He [Tue, 10 Sep 2013 19:41:10 +0000 (19:41 +0000)]
Merge "MediaMuxer: Add setLocation API" into klp-dev
Igor Murashkin [Tue, 10 Sep 2013 19:29:27 +0000 (19:29 +0000)]
Merge "camera2: Don't NPE in onStatusChanged" into klp-dev
Chet Haase [Tue, 10 Sep 2013 18:44:21 +0000 (18:44 +0000)]
Merge "Fix for transition layout suppression" into klp-dev