OSDN Git Service
Christopher Tate [Wed, 4 Sep 2013 00:48:06 +0000 (00:48 +0000)]
Merge "Sanity check users before committing new Android ID" into klp-dev
Igor Murashkin [Wed, 4 Sep 2013 00:44:31 +0000 (00:44 +0000)]
Merge "camera2: Don't NPE when closing the CameraDevice" into klp-dev
Alan Viverette [Wed, 4 Sep 2013 00:44:11 +0000 (00:44 +0000)]
Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev
Aravind Akella [Wed, 4 Sep 2013 00:41:52 +0000 (00:41 +0000)]
Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev
Geoffrey Borggaard [Wed, 4 Sep 2013 00:41:26 +0000 (00:41 +0000)]
Merge "UX improvements to the restrictions PIN" into klp-dev
Aravind Akella [Thu, 27 Jun 2013 19:04:16 +0000 (12:04 -0700)]
Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
Bug:
10109508
Change-Id: I6dfdd986bd8c3368cb568fa7d90abf9c03de9aef
Christopher Tate [Tue, 3 Sep 2013 23:57:34 +0000 (16:57 -0700)]
Sanity check users before committing new Android ID
In creation/deletion cycling we can wind up racing and attempting
to establish the Android ID on first access *after* the user has
already been deleted. Cope gracefully with this outcome.
Bug
10608503
Change-Id: I169d5052e5a2e354ce0e1f61258e45e31f5ba171
Alan Viverette [Tue, 3 Sep 2013 23:51:34 +0000 (23:51 +0000)]
Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev
Alan Viverette [Tue, 3 Sep 2013 23:33:02 +0000 (23:33 +0000)]
Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev
Romain Guy [Tue, 3 Sep 2013 23:32:33 +0000 (23:32 +0000)]
Merge "Prevent NPE when cloning gradients Bug #
10436856" into klp-dev
Alan Viverette [Tue, 3 Sep 2013 23:17:56 +0000 (16:17 -0700)]
Add methods for managing subtitle overlays in VideoView
Overlays are added directly to the VideoView, laid out to the
size of the video view, and rendered in draw().
BUG:
10260603
Change-Id: Ie8c30e5e6dcd5c6e1a2063af898afce0108a87bf
Romain Guy [Tue, 3 Sep 2013 23:08:00 +0000 (16:08 -0700)]
Prevent NPE when cloning gradients
Bug #
10436856
Change-Id: I98cbce941a06842112b8caa3753a3fa32b227da9
Alan Viverette [Tue, 3 Sep 2013 23:01:51 +0000 (16:01 -0700)]
Ensure list scrolling API is in parity with view scrolling API
Change-Id: Icaf533c0085b80f3c52cc026e0da7468698724f9
Lajos Molnar [Tue, 3 Sep 2013 22:51:32 +0000 (22:51 +0000)]
Merge "VideoView: add addSubtitleSource" into klp-dev
Matthew Xie [Tue, 3 Sep 2013 22:36:09 +0000 (22:36 +0000)]
Merge "Block ble adv api based on resource config" into klp-dev
Dianne Hackborn [Tue, 3 Sep 2013 22:04:43 +0000 (22:04 +0000)]
Merge "Fix issue #
10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev
Dianne Hackborn [Tue, 3 Sep 2013 21:34:12 +0000 (14:34 -0700)]
Fix issue #
10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY
Maybe adding more words will make it more clear. :)
Change-Id: Ie729eaba1df542d4ffcd0502ccba3807d641fd72
Romain Guy [Tue, 3 Sep 2013 21:41:39 +0000 (21:41 +0000)]
Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #
10510122" into klp-dev
Craig Mautner [Tue, 3 Sep 2013 21:06:49 +0000 (21:06 +0000)]
Merge "Insert home task into history when sending to back." into klp-dev
John Spurlock [Tue, 3 Sep 2013 20:30:47 +0000 (20:30 +0000)]
Merge "Dim status icons / battery / clock on opaque bars." into klp-dev
Tom O'Neill [Tue, 3 Sep 2013 20:25:56 +0000 (20:25 +0000)]
Merge "Improve constant names for settings injection API" into klp-dev
John Spurlock [Tue, 3 Sep 2013 20:23:49 +0000 (16:23 -0400)]
Dim status icons / battery / clock on opaque bars.
Apply consistent alpha to the other status bar elements
now that they are intrinsically brighter than before.
Bug:
10602822
Change-Id: I8ca6ddc844f9c58ddf2a1df8d1a5bd7fb71932d1
Amith Yamasani [Tue, 3 Sep 2013 20:22:15 +0000 (20:22 +0000)]
Merge "Don't call setLastChosen if it's a chooser activity instance" into klp-dev
Craig Mautner [Tue, 3 Sep 2013 19:15:57 +0000 (12:15 -0700)]
Insert home task into history when sending to back.
- There is an assumption that moving a task to the back moves it
behind the home activity. This fix ensures that the home activity
will be launched by some activity before the task that has been
moved to the back.
- Convert "private final" declarations to private only.
- Convert container tests for size()==0 to isEmpty().
- Remove unused variable.
Fixes bug
10228536.
Change-Id: I51741ee7a09652e27afffcc50c14953bf0aa27ea
Jeff Sharkey [Tue, 3 Sep 2013 19:42:13 +0000 (19:42 +0000)]
Merge "Remove deprecated ACCESS_DRM permission." into klp-dev
Amith Yamasani [Tue, 3 Sep 2013 19:30:44 +0000 (12:30 -0700)]
Don't call setLastChosen if it's a chooser activity instance
Bug:
10605359
Change-Id: If76f5cf2f45442dc25f9bfbd20a4d671b9caa358
Martijn Coenen [Tue, 3 Sep 2013 19:29:45 +0000 (19:29 +0000)]
Merge "Add drawable for Apdu Services, fix build." into klp-dev
Martijn Coenen [Tue, 3 Sep 2013 19:24:18 +0000 (12:24 -0700)]
Add drawable for Apdu Services, fix build.
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
John Spurlock [Tue, 3 Sep 2013 19:12:54 +0000 (19:12 +0000)]
Merge "Don't ever disable the status/nav bar." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 19:04:55 +0000 (19:04 +0000)]
Merge "Skip packages with missing metadata." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 19:04:39 +0000 (12:04 -0700)]
Remove deprecated ACCESS_DRM permission.
The permission no longer exists, so don't assign it to media.
Bug:
9967611
Change-Id: I5e11fcfc265310cbc3c2a8812a13e68b717fa476
Jeff Sharkey [Tue, 3 Sep 2013 19:01:20 +0000 (12:01 -0700)]
Skip packages with missing metadata.
Otherwise this would result in NPE, and packages.list would never
be updated.
Bug:
10577538
Change-Id: I35a4407dbc283ab20a4c45a2ea1a14b04044c98c
Kristian Monsen [Tue, 3 Sep 2013 18:54:50 +0000 (18:54 +0000)]
Merge "Add tracing to WebView API methods and callbacks" into klp-dev
Dirk Dougherty [Tue, 3 Sep 2013 18:50:57 +0000 (11:50 -0700)]
am
7081684f: am
c236f992: am
5e52ee6e: Doc change: small refinement of brand usage guidelines.
* commit '
7081684f17a3ec768b6048434f47578631249de6':
Doc change: small refinement of brand usage guidelines.
Romain Guy [Tue, 3 Sep 2013 18:50:23 +0000 (11:50 -0700)]
Update Bitmap.Config.ARGB_4444 documentation
Bug #
10510122
ARGB_4444 is deprecated and always replaced with ARGB_8888.
Change-Id: I0da96216af701a7df00ad35913066fbfa997d790
Dirk Dougherty [Tue, 3 Sep 2013 18:48:34 +0000 (11:48 -0700)]
am
c236f992: am
5e52ee6e: Doc change: small refinement of brand usage guidelines.
* commit '
c236f99234bbcc9b1ced14777b179adb59922b0f':
Doc change: small refinement of brand usage guidelines.
Dirk Dougherty [Tue, 3 Sep 2013 18:44:24 +0000 (11:44 -0700)]
am
5e52ee6e: Doc change: small refinement of brand usage guidelines.
* commit '
5e52ee6ecf08b299b433104798e736e2bc3904d5':
Doc change: small refinement of brand usage guidelines.
John Spurlock [Tue, 3 Sep 2013 18:44:16 +0000 (14:44 -0400)]
Don't ever disable the status/nav bar.
Revert part of the fix for b/
8682123 until we figure out why
the window state does not flip to SHOWING in BarController.
Bug:
10488453
Change-Id: Ic5d60a6d945b470fd519dc01de30690e61c62e01
Martijn Coenen [Tue, 3 Sep 2013 18:38:19 +0000 (11:38 -0700)]
NFC: @hide and remove abstract from processCommandApdu().
Replaced by new version with Bundle extras.
Bug:
10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
Dirk Dougherty [Tue, 3 Sep 2013 17:08:54 +0000 (10:08 -0700)]
Doc change: small refinement of brand usage guidelines.
Change-Id: I3e7513ee6b5cc0dd0204ca5b78c9fd13e4c8cf4a
Mindy Pereira [Tue, 3 Sep 2013 18:32:02 +0000 (18:32 +0000)]
Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev
Mindy Pereira [Tue, 3 Sep 2013 18:27:02 +0000 (11:27 -0700)]
Fix build; add new ScaleGestureDetector constructor
Change-Id: I1b6e7ef36ce79852acd6cefe03fc94143641ff0e
Svetoslav Ganov [Tue, 3 Sep 2013 18:02:57 +0000 (18:02 +0000)]
Merge "Bug fixes in the printer dialog activity and fused printer loader." into klp-dev
Svetoslav Ganov [Tue, 3 Sep 2013 18:02:15 +0000 (18:02 +0000)]
Merge "Crashes in TouchExplorer on two finger swipe." into klp-dev
Santos Cordon [Tue, 3 Sep 2013 17:43:29 +0000 (17:43 +0000)]
Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev
Santos Cordon [Tue, 3 Sep 2013 17:42:04 +0000 (17:42 +0000)]
Revert "Add permissions for the InCallUI Split."
This reverts commit
bf84eb5ed579d13b74c97b995299ca61cafedea6.
Change-Id: I40e311174898a741f5053501290833420355ad03
Mindy Pereira [Tue, 3 Sep 2013 17:38:36 +0000 (17:38 +0000)]
Merge "Add doubletap swipe to scalegesturedetector" into klp-dev
Leon Scroggins III [Tue, 3 Sep 2013 17:37:10 +0000 (17:37 +0000)]
Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev
Jeff Tinker [Tue, 3 Sep 2013 17:35:57 +0000 (17:35 +0000)]
Merge "Revert "Enhancement for OnInfo callback on DRM Framework"" into klp-dev
Kenny Root [Tue, 3 Sep 2013 17:28:40 +0000 (17:28 +0000)]
Merge changes Ic710807d,I88dfcc8c into klp-dev
* changes:
Unhide functions to allow ECDSA support
Add support for DSA and ECDSA key types
Martijn Coenen [Tue, 3 Sep 2013 17:25:01 +0000 (17:25 +0000)]
Merge "HCE API review." into klp-dev
Jean-Michel Trivi [Tue, 3 Sep 2013 17:19:55 +0000 (17:19 +0000)]
Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev
Jeff Tinker [Fri, 30 Aug 2013 23:04:34 +0000 (23:04 +0000)]
Revert "Enhancement for OnInfo callback on DRM Framework"
This reverts commit
6fd97b7d93c5eeaefb2695786b35d1672c88b0cf.
Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video
bug:
10542864
Change-Id: I85b84d6b602079571be1a7237c907716db9cdf54
Kenny Root [Tue, 3 Sep 2013 16:45:55 +0000 (09:45 -0700)]
Unhide functions to allow ECDSA support
Bug:
10600582
Change-Id: Ic710807d7e771737521e0abd83af2f666ec1199c
Santos Cordon [Tue, 3 Sep 2013 16:45:24 +0000 (16:45 +0000)]
Merge "Add permissions for the InCallUI Split." into klp-dev
Svetoslav Ganov [Tue, 3 Sep 2013 16:24:48 +0000 (09:24 -0700)]
Crashes in TouchExplorer on two finger swipe.
1. The logic for finding the active pointer was incorrect. The code was
iterating over all pointer ids and taking the minimum, i.e. the pointer
that first went down. The problem was that the down time for pointers
that are not down was also considered (set to zero), thus sometimes we
would consider the first pointer that went down to be a pointer that
is not down at all. Now we are iterating only over the pointers that
are down.
2. The batched events while waiting to see if the user is exploring or
gesturing were added even if we were in touch exploration state at which
point we do not have to batch. As a result we ended up having lefovers
from a previous gesture when handling the delayed events and crash.
bug:
10312546
Change-Id: I4728541ac12e4da4577d22e4314101dd169a52fb
Svetoslav Ganov [Tue, 3 Sep 2013 07:11:58 +0000 (00:11 -0700)]
Bug fixes in the printer dialog activity and fused printer loader.
1. Fused printers loader was not using the discovered printers to update the
historical ones. Now if a historical printer is discovered we update its state
with the discovered, i.e. most recent, information.
2. Fixed a bug in the destination adapter of the print job config dialog that
was leading to a crash if all printers item is selected when there are no
discovered printers.
3. Updated the add printers asset in the all printers screen.
4. Historical printers were not persisted by the print dialog activity.
5. Reduced the number of printers we send per transation to avoid the binder
transaction size limit. Added sending of printers in chunks in a place
this was missing.
Change-Id: I88b54888360bc0e53b06bd260c2b832d0d6454b6
Leon Scroggins III [Tue, 3 Sep 2013 15:35:00 +0000 (11:35 -0400)]
Change name back to CreateJavaInputStreamAdaptor.
In order to fix open source builds, change WrapJavaInputStream's
name back to CreateJavaInputStreamAdaptor.
Remove FIXME in CopyJavaInputStream, and return a more generic type,
since the more specific type was only needed by a change in external/webkit,
which is being reverted since it depends on unreleased code.
Change-Id: I89b0431e357b509a2a0c17a624b31bd49d29070f
Santos Cordon [Tue, 13 Aug 2013 21:29:47 +0000 (14:29 -0700)]
Add permissions for the InCallUI Split.
Change-Id: Ic759d14acefcea746e0d8e86c0f006d4bc462386
Kenny Root [Fri, 16 Aug 2013 21:03:29 +0000 (14:03 -0700)]
Add support for DSA and ECDSA key types
(cherry picked from commit
f64386fc26efeb245fd90fabaa47b8c8bf9b4613)
Bug:
10600582
Change-Id: I88dfcc8ca602f55fad54bd8bf043aee460c0de24
Svetoslav Ganov [Tue, 3 Sep 2013 07:24:57 +0000 (07:24 +0000)]
Merge "System print service enabled after every system reboot" into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:55 +0000 (03:50 +0000)]
Merge "Filter roots based on incoming request." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:27 +0000 (03:50 +0000)]
Merge "New recents behavior to match spec." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:10 +0000 (03:50 +0000)]
Merge "Instance state, fix sharing, Durable objects." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:00 +0000 (03:50 +0000)]
Merge "Use Cursors directly when binding documents." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 00:19:40 +0000 (17:19 -0700)]
Filter roots based on incoming request.
When incoming request is for local-only content, or for ACTION_CREATE,
only include roots advertise those features.
Filters roots based on the allowed MIME types and the supported types
advertised by each root. This supports displaying Images and Audio
roots only when requesting those content types. Applies the same
filter when deciding which roots to query for recents.
Fixes advanced filtering instead of limiting to just devices. Update
sorting so that Recent always appears first. Add testing support for
LOCAL_ONLY.
Bug:
10597317,
10526535
Change-Id: Ic5ccf475c4fe93fd52b29388d369d7f6915c0c42
Jeff Sharkey [Tue, 3 Sep 2013 00:07:17 +0000 (00:07 +0000)]
Merge "Refactoring of DocumentsContract." into klp-dev
Svetoslav Ganov [Mon, 2 Sep 2013 22:24:45 +0000 (15:24 -0700)]
System print service enabled after every system reboot
The system was overriding the user on every boot by turing of all system
print services, i.e. service that are on the system image. Now the system
print service are enabled by default only once per user, the user can later
disable them and the system does not override that. We now have a system
setting with the services we enabled once by default so we never do
default enabling again (unless device is wiped).
bug:
10594775
Change-Id: Id3129ccfba95bf57375ea9fec0b5ca0e51bda199
Jeff Sharkey [Mon, 2 Sep 2013 22:07:28 +0000 (15:07 -0700)]
New recents behavior to match spec.
Updated behavior queries each documents root for recently modified
documents. It uses a new variant of DirectoryLoader which limits the
maximum number of parallel queries to relieve memory pressure. When
first started, it waits up to 500ms for everyone to finish, then
publishes whatever results are ready, and then refreshes results as
each straggler finishes.
New RootCursorWrapper that always blends in authority and rootId
columns, which are used for binding root details from blended cursors.
Bug:
10593596,
10329994
Change-Id: Icc0d4a2f1b6166edc72f78a4c88f444eeba6f2f0
Przemyslaw Szczepaniak [Mon, 2 Sep 2013 15:41:05 +0000 (16:41 +0100)]
Fix SynthesisRequest javadoc
Bug:
10548784
Change-Id: I76a89bb9accdeee00c60a668adbdd789b995cd92
satok [Mon, 2 Sep 2013 05:49:42 +0000 (05:49 +0000)]
Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev
Jeff Sharkey [Mon, 2 Sep 2013 01:41:04 +0000 (18:41 -0700)]
Instance state, fix sharing, Durable objects.
Remember instance state across configuration changes, and enable
rotation. This remembers current modes and in-progress traversals.
Always finish action modes after launching an action. Fix sharing
by always putting Uris in extras, and always wrap in a chooser. Find
common MIME types when sharing multiple documents. Fix downloads
launching by following directory MIME type change.
Introduce "Durable" which is like Parcelable, but can be used for
both byte[] storage and Parcel transport. Make both DocumentInfo
and DocumentStack durable.
Disable recents until new behavior is implemented.
Bug:
10460236,
10446265,
10533674,
10456344,
10456702
Change-Id: I4eaf2b0b4cde611c69a1e7b5f1586f6b02019b27
Jeff Sharkey [Sun, 1 Sep 2013 04:27:44 +0000 (21:27 -0700)]
Use Cursors directly when binding documents.
Instead of creating a DocumentInfo for every list item, bind the
adapter against Cursor directly.
Create new SortingCursorWrapper which performs sorting at query time
and keeps a O(1) mapping from sorted to unsorted positions in the
underlying Cursor.
Suppress extra loader passes that had been kicked off. Use unstable
provider when querying to guard against broken providers.
Bug:
10567506,
10510851
Change-Id: I535814da6b17c38de04a1175e0afcc78c6b966ce
Jeff Sharkey [Sat, 31 Aug 2013 22:02:20 +0000 (15:02 -0700)]
Refactoring of DocumentsContract.
Combines related columns and constants onto the same class so they
are easier to discover. Move back to surfacing roots with columns
so they are consistent with documents.
Advanced roots are represented with a flag instead of distinct
types. Flags to indicate supporting of well-known media types,
instead of arbitrary an MIME filter. Reintroduce well-formed rootId
to support recents.
Always use the expanded version of "documents" in constants, methods,
and argument names.
Refactor DocumentProvider method names to clearly distinguish if
a single item or multiple could be returned, and of which type. Add
documentation to clearly define which methods have already been
overridden.
Bug:
10567506,
10567557
Change-Id: I981f26ab82f2b520a19aa1ce66f659de50d7fac0
John Spurlock [Sat, 31 Aug 2013 14:59:31 +0000 (14:59 +0000)]
Merge "Status bar icons as expressions of white." into klp-dev
Ed Tam [Sat, 31 Aug 2013 01:14:59 +0000 (18:14 -0700)]
am
468c60b3: (-s ours) am
00e4c672: am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
468c60b334321d5790b0b5bd962870939aac0ab2':
Telephony: SMS over IMS, DO NOT MERGE
John Spurlock [Sat, 31 Aug 2013 00:53:26 +0000 (20:53 -0400)]
Status bar icons as expressions of white.
Bug:
10502089
Change-Id: Id13badd6c729b79492aec5370dbb3dc2479008fd
Alan Viverette [Fri, 30 Aug 2013 23:58:08 +0000 (23:58 +0000)]
Merge "Update internal AutoScrollHelper to match support lib version" into klp-dev
Kenny Root [Fri, 30 Aug 2013 23:21:25 +0000 (23:21 +0000)]
Merge "Use core-tests-support instead of core-tests" into klp-dev
Kenny Root [Thu, 29 Aug 2013 21:27:20 +0000 (14:27 -0700)]
Use core-tests-support instead of core-tests
The core-tests-support library is newly created. It doesn't have any
tests itself but some support for tests that need to use mocked classes
for testing. In this case, some tests are using TestKeyStore for SSL
testing in frameworks tests.
(cherry picked from commit
c2d6728350f3ec80f9b4c8967794558e42516987)
Bug:
10092469
Change-Id: Ib38364c607de5a98eb242050eaaf52b22ab8ca57
Geoffrey Borggaard [Thu, 29 Aug 2013 02:13:10 +0000 (22:13 -0400)]
UX improvements to the restrictions PIN
As per Rachel. Remove the title, change the hint text.
Don't make the dialog disappear after failed attempts.
Bug:
10542734
Change-Id: I1cae3d74bd4da06364626d63faf945f629cf6537
Jonathan Dixon [Wed, 28 Aug 2013 22:54:29 +0000 (15:54 -0700)]
Add tracing to WebView API methods and callbacks
Bug:
10488419
This is useful for debugging numerous SxS issues.
Change-Id: I5d0d2e253499741c5f9454582988c99e42dc0a81
Lajos Molnar [Fri, 16 Aug 2013 03:56:53 +0000 (20:56 -0700)]
VideoView: add addSubtitleSource
A way to add external subtitle file to VideoView.
Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10326117
Alan Viverette [Fri, 30 Aug 2013 21:43:25 +0000 (14:43 -0700)]
Fix pre tag formatting in getDragToOpenListener documentation
BUG:
10549164
Change-Id: Ie3e05e918edbd737326c724e4e712279ac410238
Matthew Williams [Fri, 30 Aug 2013 21:39:15 +0000 (21:39 +0000)]
Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev
Alan Viverette [Fri, 30 Aug 2013 21:34:42 +0000 (21:34 +0000)]
Merge "Update captioning APIs" into klp-dev
Alan Viverette [Fri, 30 Aug 2013 21:33:13 +0000 (14:33 -0700)]
Update internal AutoScrollHelper to match support lib version
BUG:
10547956
Change-Id: I7d5b1b9fb89ae8ff4294cc2dfd01e29b55ed3eba
Matthew Williams [Tue, 20 Aug 2013 22:32:20 +0000 (15:32 -0700)]
DO NOT MERGE. Remove service component for KLP.
1) As discussed, lack of internal clients -> remove SyncService
component from KLP. This CL reverts that addition.
2) Also includes javadoc cleanup of existing API.
3) Fix naming of allowMetered() -> disallowMetered() in API
4) Removed one-off sync in the future, as it doesn't make sense
for sync adapters.
Change-Id: I1b17094e6edafb2955cdfb99f39b44274fbe86f9
Jeff Hao [Fri, 30 Aug 2013 21:10:40 +0000 (21:10 +0000)]
Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev
Jesse Hall [Fri, 30 Aug 2013 21:09:12 +0000 (21:09 +0000)]
Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
Ed Tam [Fri, 30 Aug 2013 21:06:47 +0000 (14:06 -0700)]
am
00e4c672: am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
Telephony: SMS over IMS, DO NOT MERGE
Ed Tam [Fri, 30 Aug 2013 21:04:45 +0000 (14:04 -0700)]
am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
Telephony: SMS over IMS, DO NOT MERGE
Ed Tam [Fri, 30 Aug 2013 20:50:35 +0000 (20:50 +0000)]
Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
Jesse Hall [Fri, 30 Aug 2013 20:49:14 +0000 (13:49 -0700)]
EGL10.eglCreateWindowSurface should set producerControlledByApp
Bug:
10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
Jim Miller [Fri, 30 Aug 2013 19:55:38 +0000 (19:55 +0000)]
Merge "Attempt to fix missing clock bug" into klp-dev
Vinit Deshapnde [Fri, 30 Aug 2013 19:48:12 +0000 (19:48 +0000)]
Merge "Synchronize access to single supplicant path" into klp-dev
Vinit Deshapnde [Fri, 30 Aug 2013 19:31:25 +0000 (12:31 -0700)]
Synchronize access to single supplicant path
Both wlan0 and p2p0 state machines are accessing the supplicant socket
simultaneously; and may get responses of each other's command. This
change introduces synchronization between these two processes.
Bug:
10375978
Change-Id: I0ac0b2771311b642affc353958cc9ba2e5dd5716
Jonathan Dixon [Fri, 30 Aug 2013 19:15:41 +0000 (19:15 +0000)]
Merge "Remove WebViewClassic specific test code" into klp-dev
Zhentao Sun [Fri, 30 Aug 2013 19:11:28 +0000 (19:11 +0000)]
Merge "Fixed b/
10512887." into klp-dev
Martijn Coenen [Fri, 30 Aug 2013 18:14:46 +0000 (11:14 -0700)]
HCE API review.
Keeping some of the old stuff @hide until all
clients have upgraded.
Bug:
10550349
Change-Id: Id5de7ab74c9b38c179fd20bd4746d95b7df8f033