110914 Commits

Author SHA1 Message Date
Wink Saville
b42beeafcf am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported.
* commit 'e63411f28b81a0c9f7fee1d0b3a0765606c9a6f2':
  In isMobileOk don't execute finally if mobile data is not supported.
2013-08-26 11:40:36 -07:00
Chris Craik
54f574acf4 Move functor GL setup to just before functor
bug:10399469

Because the stencil setup can issue draws, it *must* come before the
GL state setup.

Change-Id: I52a36213549fc60b091a90cbb923a1f0d35f9a65
2013-08-26 11:23:46 -07:00
Jean-Michel Trivi
22e3eb64bf "Year" is an authorized metadate long field.
MediaMetadataRetriever.METADATA_KEY_YEAR is listed as one of the
 supported long fields but is not declared in the list of authorized
 long keys.

Change-Id: If277f0c300e2bfed10472e23a2eeba08bfa6ed33
2013-08-26 11:23:32 -07:00
Igor Murashkin
57ea59b376 camera2: CameraDevice#configureOutputs now deletes unused streams
Bug: 10461554
Change-Id: I3dc48e434d83b18909d25723cc8855c82e1072bc
2013-08-26 11:09:40 -07:00
Tom O'Neill
4a7c49c81f Address API Review for SettingInjectorService
- Escape < and > in javadoc

- Constructor does not take log tag

- Start intent rename

- Comments for Status.summary and enabled

- Bonus fixes:

  - Start renaming STATUS_KEY to SUMMARY_KEY

  - Send message back even if getting the status fails so we don't have
  to wait for the fetch to time out

  - Add comment about setting activity being invoked when disabled

- Partial fix for b/10461474

Change-Id: I025e7e0782c2873a4eda20ab4793bc6145daf8db
2013-08-26 10:08:12 -07:00
Baligh Uddin
0c96890b33 Import translations. DO NOT MERGE
Change-Id: I6b1373d144c4cfcce6f514051adbd179373180bf
Auto-generated-cl: translation import
2013-08-26 09:53:28 -07:00
Baligh Uddin
dc6c5a9950 Import translations. DO NOT MERGE
Change-Id: I90a32d22c5c97408ef96635be46c069c22fddca7
Auto-generated-cl: translation import
2013-08-26 09:45:01 -07:00
Baligh Uddin
a943688bb0 Import translations. DO NOT MERGE
Change-Id: I7be513f3d5decec282200b01900ce480fcf291cf
Auto-generated-cl: translation import
2013-08-26 09:42:10 -07:00
Jeff Tinker
91b87de7e1 Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev 2013-08-26 16:09:08 +00:00
Daniel Sandler
fead1290d7 Make xxhdpi adb icon consistent with other densities.
Bug: 10487353
Change-Id: I50441587988d36e94cfb453ab9706b0ae46b066b
2013-08-26 11:04:02 -04:00
Scott Greenwald
6341010997 Change DBG to false to eliminate logcat messages.
DemoContactNotificationScorer was spamming logcat because DBG was
set to true. Also changed TAG to match the class name.

Bug: 10457063
Change-Id: Idca251b5b46d58ab64407e94ed4bec831e880aa4
2013-08-26 14:59:44 +00:00
Ying Wang
9436631333 Fix docs build.
Change-Id: I3299e59fd90141fee324129ff3b251bdf8f60f10
2013-08-23 22:20:03 -07:00
Fabrice Di Meglio
138de8e16d Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()
- be aware that getCurrentHour() value can vary with "mIs24HourView"
- so force no notification of onTimeChanged() for setCurrentHour() when
we are just changing 12h/24h view

Change-Id: I358eda29cf0c66a811cde494136d7cfc27fca39f
2013-08-23 19:38:05 -07:00
Jim Miller
14cabdabac Merge "Add setting to disable keyguard widgets" into klp-dev 2013-08-24 01:28:28 +00:00
Takeshi Aimi
6fd97b7d93 Enhancement for OnInfo callback on DRM Framework
In DRM framework, plugins can transmit DrmInfoEvent to Java layer.
Although DrmInfoEvent has several entries, current implementation
can only convey integer and String. This change enables plugins
uto propagate a hashmap to Java layer. The hashmap can have
one or more Strings and one byte array as value.

Changes are made by Sony Corporation.

bug: 10459159

Change-Id: I5f2bfb43b676863ef4d220fd4ef1e48777e92752
(cherry picked from commit 84a5b5cab40711e20ba70c5ed4dfeab6b558b53b)
2013-08-23 18:02:40 -07:00
Jeff Brown
61d806c76a Merge "Docs changes pursuant to API review feedback." into klp-dev 2013-08-24 00:47:16 +00:00
Jeff Brown
511cd35fcc Docs changes pursuant to API review feedback.
Change-Id: I74c51791192f7fefad4e299d25c91438cbf6ab73
2013-08-23 17:44:47 -07:00
destradaa
9e73cce6ac Merge "Fix leaks of JNI objects in the local reference table" into klp-dev 2013-08-24 00:44:37 +00:00
Jim Miller
f45bb40388 Add setting to disable keyguard widgets
This allows disabling keyguard widgets through Settings.
On new devices, the setting is turned off by default.  If the
user currently has widgets in keyguard, then we keep them
and re-enable the setting.

Change-Id: I7258921231d439925ac8627105710efa99309094
2013-08-23 17:36:30 -07:00
destradaa
b75cb3aeb4 Fix leaks of JNI objects in the local reference table
Change-Id: I769502f8b13e0025707abdf98c24f2cac0604602
2013-08-23 17:26:16 -07:00
Ying Wang
0f91c63602 Better aidl generated dependency
Previously if an imported aidl file has been deleted or moved,
the generated dependency file still contains the stale file name,
and make will fail with "No rule to make target <the deleted/moved
file>".
This change uses technique described in section "Automatic Dependency
Generation", Chapter 8 of "Managing Projects with GNU Make (3d
Edition)".
The same technique is used by the Android platform build system to
generate C/C++ header dependencies.

Bug: 10459179
Change-Id: Ib0c01a4234ef1af994487fdc846cdf8d13a675f6
2013-08-23 17:19:17 -07:00
Tim Murray
c264e04400 Merge "Add garbage collection hooks" into klp-dev 2013-08-23 23:40:48 +00:00
Chong Zhang
5de1faca16 Merge "wifi-display: add certification options" into klp-dev 2013-08-23 23:18:52 +00:00
Jeff Sharkey
365768fd35 Merge "Return EXIF thumbnails when available." into klp-dev 2013-08-23 23:18:11 +00:00
Jeff Sharkey
98d6212327 Merge "Add CancellationSignal support to file operations." into klp-dev 2013-08-23 23:17:47 +00:00
Chong Zhang
1f3ecaae63 wifi-display: add certification options
When certification mode is enabled:

- Pass wfd session info to wifi display settings

- Allow sink to connect to source

- Add interface in display manager for pausing/resuming session

- Add interface in WifiP2pManager for setting lc, oc and starting
  autonomous GO

Note that we're compliant regardless of certification mode, but
some confusing options (eg. allowing incoming connection from
sink) we want to hide when not being tested.

Bug: 9371882
Change-Id: Icc7dcae4e046453796cfa03f5f197055fabf234b
2013-08-23 16:02:09 -07:00
Dirk Dougherty
570cd0f4c0 am f1fea527: am be2f72a1: am 2c30fe8a: Doc change: fix typo in policy docs.
* commit 'f1fea52744eeaeed37a674c3fc94b7e1dbcda341':
  Doc change: fix typo in policy docs.
2013-08-23 15:53:01 -07:00
Dirk Dougherty
f1fea52744 am be2f72a1: am 2c30fe8a: Doc change: fix typo in policy docs.
* commit 'be2f72a187cfe15adb2760c05e78ca9905f8bb8d':
  Doc change: fix typo in policy docs.
2013-08-23 15:50:08 -07:00
Dirk Dougherty
be2f72a187 am 2c30fe8a: Doc change: fix typo in policy docs.
* commit '2c30fe8aedc5af2845e97b9005d6dce570f9d8eb':
  Doc change: fix typo in policy docs.
2013-08-23 15:45:53 -07:00
Baligh Uddin
4f5e080486 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-23 21:26:48 +00:00
Baligh Uddin
881de10cfc Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-23 21:26:42 +00:00
Eino-Ville Talvala
8ebd52bf41 Camera2: Add CameraDevice#flush()
- For quickly clearing out all pending and in-progress captures

Bug: 9758581
Change-Id: Ie4123fcc4d4b648a11d4a6257c531f07182bab39
2013-08-23 14:20:35 -07:00
Tim Murray
2f2472c42b Add garbage collection hooks
bug 10428172

Change-Id: I6365aa58bbc99aa134e1f261a5819e07a7d70fb0
2013-08-23 13:35:19 -07:00
Svetoslav Ganov
826debf5f8 Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev 2013-08-23 20:00:29 +00:00
Jeff Sharkey
6398343e83 Return EXIF thumbnails when available.
Adds new ExifInterface method to extract the thumbnail range from
a larger image file, and use that to return an AssetFileDescriptor.

When decoding an AssetFileDescriptor thumbnail with offsets, read out
the raw data entirely, since Skia uses lseek() aggressively.

Bug: 10412208
Change-Id: I7906cdf82c0c3794cec7043c801a86f66efeb143
2013-08-23 12:19:19 -07:00
John Huang
83bc5a8a86 Merge "Additional logging to debug lost Wifi APs" into klp-dev 2013-08-23 19:13:49 +00:00
Baligh Uddin
8a2df16745 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-23 18:59:50 +00:00
Baligh Uddin
e1f9e2f60d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-23 18:59:33 +00:00
Vinit Deshapnde
e8fabf98fb Additional logging to debug lost Wifi APs
This change adds some in-memory logging to get some information that
doesn't seem to get captured in bug reports readily. We can remove this
after we've got to the bottom of this issue.

This is the sort of log it produces in bugreport -

WifiConfigStore - Log Begin ----
16:30:06 - loadConfiguredNetwork GoogleGuest
16:30:06 - loadConfiguredNetworks loaded 1networks
16:30:06 - disableAllNetworks
16:30:06 - loadConfiguredNetwork GoogleGuest
16:30:06 - loadConfiguredNetworks loaded 1networks
WifiConfigStore - Log End ----

Bug: 10375978
Change-Id: Iaecd3b391aea3711bf376d6cb520217d3242e6f1
2013-08-23 11:53:40 -07:00
Zhijun He
4cabe3eae8 Merge "ImageReader: Fix API doc table misalignment issue" into klp-dev 2013-08-23 18:49:42 +00:00
Svetoslav Ganov
44720af55a Print UI bug fixing and printer discovery refactoring.
1. Added support for selecting a printer from the all printers activity
   that is not in the initial printer selection drop down. The user
   initially sees a sub set of the printers in the drop down and the
   last option is to see all printers in a separate activity. Some
   of the printers in the all printers activity are not shown in the
   initial drop down.

2. Refactored printer discovery by adding (private for now) printer
   discovery app facing APIs. These APIs are needed to support multiple
   printer selection activities (print dialog and all printers activities)
   and also the settings for showing all printers for a service.

   Now multiple apps can request observing for printers and there is
   a centralized mediator that ensures the same printer discovery
   session is used. The mediator dispatches printer discovery specific
   requests to print services. It also aggregates discovered printers
   and delivers them to the interested apps. The mediator minimizes
   printer discovery session creation and starting and stopping discovery
   by sharing the same discovery session and discovery window with
   multiple apps. Lastly, the mediator takes care of print services
   enabled during discovery by bringing them up to the current
   discovery state (create discovery session and start discovery if
   needed). The mediator also reports disappearing of the printers
   of a service removed during discovery and notifies a newly
   registered observers for the currnet printers if the observers are
   added during an active printer discovery session.

3. Fixed bugs in the print UI and implemented some UX tweaks.

Change-Id: I4d0b0c5a6c6f1809b2ba5dbc8e9d63ab3d48f1ef
2013-08-23 18:36:33 +00:00
Dirk Dougherty
2c30fe8aed Doc change: fix typo in policy docs.
Change-Id: Ic9df2511f50d9ead2dcbf4353f387e9106ce4222
2013-08-23 11:31:29 -07:00
Jeff Sharkey
bd3b902567 Add CancellationSignal support to file operations.
Since ContentProvider file operations can end up doing substantial
network I/O before returning the file, allow clients to cancel their
file requests with CancellationSignal.

Ideally this would only be needed for openFile(), but ContentResolver
heavily relies on openAssetFile() and openTypedAssetFile() for common
cases.

Also improve documentation to mention reliable ParcelFileDescriptors
and encourage developers to move away from "rw" combination modes,
since they restrict provider flexibility.  Mention more about places
where pipes or socket pairs could be returned.

Improve DocumentsContract documentation.

Bug: 10329944
Change-Id: I49b2825ea433eb051624c4da3b77612fe3ffc99c
2013-08-23 11:27:25 -07:00
Jason Monk
4359d56420 Merge "System binds PAC Local Proxy instead of self start" into klp-dev 2013-08-23 17:53:33 +00:00
Dirk Dougherty
b8d3a3de67 am 2a804e49: am 1b6d1990: am 80bd95bf: Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs
* commit '2a804e49ddabe79606948955c6d07b3fb8f2499d':
  Doc change: update Google Play policies descriptions.
2013-08-23 10:21:07 -07:00
Dirk Dougherty
2a804e49dd am 1b6d1990: am 80bd95bf: Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs
* commit '1b6d199009d32c3b721857b748bc919429f5230b':
  Doc change: update Google Play policies descriptions.
2013-08-23 10:18:10 -07:00
Dirk Dougherty
1b6d199009 am 80bd95bf: Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs
* commit '80bd95bf86e43e5bbca6a08ede708524e5024a1c':
  Doc change: update Google Play policies descriptions.
2013-08-23 10:15:42 -07:00
Dirk Dougherty
80bd95bf86 Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs 2013-08-23 17:13:05 +00:00
Chris Craik
c78f39d8c2 Merge "Add cleanspec for bitmap jni issue" into klp-dev 2013-08-23 17:12:10 +00:00
Dirk Dougherty
3d205ab01e Doc change: update Google Play policies descriptions.
Change-Id: I4ebc985159db5f24632bac38cff63c7b663794b8
2013-08-23 10:11:44 -07:00