110897 Commits

Author SHA1 Message Date
Wink Saville
ba5e533eda Merge "In isMobileOk don't execute finally if mobile data is not supported." into klp-dev 2013-08-13 22:57:54 +00:00
John Spurlock
bcadfea84e am f464511a: Merge "Sysui flag-related doc fixes." into klp-dev
* commit 'f464511a7be2e381f508b5b2b937f19c98d800c2':
  Sysui flag-related doc fixes.
2013-08-13 15:41:40 -07:00
Adam Skory
2ce5265e98 am 3890f854: Merge "Fix NPE in ActivityManagerService" into klp-dev
* commit '3890f8543aefa1fba843b49d9482da2ac6a5bdc9':
  Fix NPE in ActivityManagerService
2013-08-13 15:38:06 -07:00
John Spurlock
f464511a7b Merge "Sysui flag-related doc fixes." into klp-dev 2013-08-13 22:35:57 +00:00
Adam Skory
3890f8543a Merge "Fix NPE in ActivityManagerService" into klp-dev 2013-08-13 22:30:51 +00:00
Kenny Root
fb381053d5 Use hostname verifier directly instead of instance DO NOT MERGE
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
2013-08-13 15:21:57 -07:00
Kenny Root
18e1524f5f am 87fefc44: am 1adbf6b9: (-s ours) am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '87fefc449bffabebf98020f40d21d28500b1c1bb':
  Use hostname verifier directly instead of instance DO NOT MERGE
2013-08-13 14:54:13 -07:00
Scott Main
97daa7c0b2 am ab69476a: am 9b979448: am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit 'ab69476a2be4a60ca73e1721cb46e956e87ec29a':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
2013-08-13 14:54:10 -07:00
Kenny Root
87fefc449b am 1adbf6b9: (-s ours) am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '1adbf6b900a621675cd1928307bb88bb2c6501e5':
  Use hostname verifier directly instead of instance DO NOT MERGE
2013-08-13 14:51:52 -07:00
Scott Main
ab69476a2b am 9b979448: am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit '9b979448581311f27456c1dcb9623a8d21bcf64f':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
2013-08-13 14:51:31 -07:00
Tom O'Neill
fa2992c412 API for location settings injection
- Partial fix for b/10287745

Change-Id: Ie998ce0a7b350e4183fce5753bfac3eb51238ff4
2013-08-13 14:41:22 -07:00
Igor Murashkin
53f91c5c26 camera2: Clear up docs for CameraDevice#configureOutputs
Change-Id: Id2397ca17c5968cb4dfdb337ea56be9d5f481669
2013-08-13 14:37:42 -07:00
Robert Greenwalt
0451d59ba2 Add support for batched wifi scans.
bug:9301872

Change-Id: I5a7edfdbd2b78a65119d11acad491eae350c0870
2013-08-13 14:37:37 -07:00
John Spurlock
7facd7f6f1 Sysui flag-related doc fixes.
Add new flags to existing flag listings, fix a broken @link, and
tweak wording.

Change-Id: Iebc4f5fc1c6fc3f8685c6252f88d8044fe08b79d
2013-08-13 17:34:04 -04:00
Adam Skory
164c2edccd Fix NPE in ActivityManagerService
Bug: 10294281
Change-Id: Iaf608ae099b90fac8ad726285652b5c3e74e1632
2013-08-13 14:24:34 -07:00
Kenny Root
32c990044f Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
2013-08-13 14:13:08 -07:00
Craig Mautner
34dd35b296 Fix Configuration layout direction comparison.
If the Configuration layout direction is not changing don't indicate
that it has changed. When the indication is made incorrectly it
causes the window manager to believe that the configuration has
changed and it will start freezing the screen and setting up
animations. Bad jank is the result.

In Configuration.updateFrom() anytime that the screenLayouts were
different the code was setting ActivityInfo.CONFIG_LAYOUT_DIRECTION
in the return bitmask. Even if the only difference was between
UNDEFINED fields. This fix makes sure that the layout direction
field has actually changed before setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask.

In Configuration.diff() if the passed Configuration had
SCREENLAYOUT_LAYOUTDIR_UNDEFINED the code was setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask. This fix
makes sure that if the passed Configuration has fields set to
SCREENLAYOUT_*_UNDEFINED then corresponding bits will no longer be set
in the returned bitmask.

Fixes bug 10291622.
Fixes bug 10247094.

Change-Id: If26de662206fe85dc4671adbae39dfb99dc1038c
2013-08-13 13:29:18 -07:00
Fabrice Di Meglio
1c97c50cc7 am 63113994: Merge "Code cleaning for Drawables" into klp-dev
* commit '63113994034e2e71bac40d2de076fa9b1b406960':
  Code cleaning for Drawables
2013-08-13 13:17:38 -07:00
Fabrice Di Meglio
6311399403 Merge "Code cleaning for Drawables" into klp-dev 2013-08-13 20:13:46 +00:00
Craig Mautner
92b0673b60 am 1beff478: Merge "Fix Configuration layout direction comparison." into klp-dev
* commit '1beff4787110b92bea5b5c6c8cf67a757a2f0565':
  Fix Configuration layout direction comparison.
2013-08-13 12:41:41 -07:00
Wink Saville
afe58b07db In isMobileOk don't execute finally if mobile data is not supported.
Move the early return outside the try {} finally so we don't call
setEnableFailFastMobileData(DctContants.DISABLED). Otherwise
referencing counting is wrong and an exception is thrown in DcTrackerBase.

Bug: 10304904
Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
2013-08-13 12:41:06 -07:00
Craig Mautner
1beff47871 Merge "Fix Configuration layout direction comparison." into klp-dev 2013-08-13 19:38:01 +00:00
Eino-Ville Talvala
5a32b20ccc Camera2: Add metadata keys and enum values
- Insert metadata enum ints into CameraMetadata
- Insert metadata Keys into relevant files
- Remove some dead code in CameraMetadata

Generated from /system/media/camera/docs.

Change-Id: I3d864ad8c7add5f35ca740860cb2883d54a0791e
2013-08-13 12:35:57 -07:00
Kenny Root
1adbf6b900 am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '61768c97d6e066d633afe61a790a24473f59572c':
  Use hostname verifier directly instead of instance DO NOT MERGE
2013-08-13 11:44:05 -07:00
Kenny Root
61768c97d6 am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '3870c570bbd438cefd09a061b9481314a15dd659':
  Use hostname verifier directly instead of instance DO NOT MERGE
2013-08-13 11:41:11 -07:00
Scott Main
9b97944858 am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit '261e00cb046db01b2bae9342f34ff99e99ada368':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
2013-08-13 11:00:49 -07:00
Kenny Root
3870c570bb Use hostname verifier directly instead of instance DO NOT MERGE
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
2013-08-13 11:00:10 -07:00
Scott Main
261e00cb04 am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit 'b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
2013-08-13 10:57:31 -07:00
Romain Guy
820726d7c6 am 9955699d: Merge "Camera.applyToCanvas() now works with hardware canvases" into klp-dev
* commit '9955699d30eaab964549b8173fe9a52dca782877':
  Camera.applyToCanvas() now works with hardware canvases
2013-08-13 10:50:26 -07:00
Romain Guy
9955699d30 Merge "Camera.applyToCanvas() now works with hardware canvases" into klp-dev 2013-08-13 17:46:19 +00:00
Romain Guy
7fbbc3c9c3 Camera.applyToCanvas() now works with hardware canvases
Change-Id: I7f06b2a74ccc1941d51e12a0417028e094c1b669
2013-08-13 10:37:25 -07:00
John Spurlock
5d2268ad8d am e932e30e: Distinguish transient + transparent bar styles.
* commit 'e932e30eadb5978591316ffe3d21d60604c0cd91':
  Distinguish transient + transparent bar styles.
2013-08-13 10:34:49 -07:00
Lajos Molnar
80c4437ebf MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities
Added isFeatureSupported method to CodecCapabilities, so that applications
can query whether codecs support various features.  For now
added one video-decoder feature:

FEATURE_AdaptivePlayback

Media playback applications can query it to see if the codec
supports seamless resolution changes during decoding.

Change-Id: I56b2cf1429f39f9b9e0243a990c95e7a64dd7ff7
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug: 7093648
2013-08-13 10:30:22 -07:00
John Spurlock
e932e30ead Distinguish transient + transparent bar styles.
Transient bars = 30% black scrim per spec (formerly view alpha).
Transparent nav bar = Simple gradient drawable from 50% to 0% black.
Transparent status bar = Fully transparent.

Smoother transitions between bar modes will be tricky due to
coordination with window manager, and thus deferred to a separate
future change.

Pre-baked assets instead of the gradient drawable will also be
part of a separate future change, this change is simply meant to
move closer to the final look and feel to minimize confusion for
those kicking the tires on the new flags.

Bug:10012887
Change-Id: I8c35a660187903224a6bfe604b5313e9115c4a73
2013-08-13 13:29:43 -04:00
John Spurlock
8fb569e86c am 34e13d90: Update transient navigation confirmation logic.
* commit '34e13d90eda9bfda7a70998d190a95c88aa3d3d1':
  Update transient navigation confirmation logic.
2013-08-13 10:24:24 -07:00
John Spurlock
34e13d90ed Update transient navigation confirmation logic.
Show the confirmation toast when hiding the transient
navigation bar only the first time per app, per reboot.

Hitting the power key while the transient nav is hidden
is taken as a signal of possible user confusion, so reshow
the prompt the next time.

This requires the confirmation prompt to live in policy
(not sysui).  It arguably should have been here in the first
place, since the transient bar state/policy was here, and
sysui should not have not been able to fail to display
the prompt correctly.

Also take this opportunity to remove a hack wrt positioning
the confirmation properly while the nav bar is transitioning.
Toasts now support LAYOUT_HIDE_NAVIGATION if applied to the
toast's view.

Bug: 10246225
Change-Id: Ieb6355e4ca975c0758918a39e3c2ec13da81c7f4
2013-08-13 13:18:14 -04:00
Craig Mautner
31678b52e4 Fix Configuration layout direction comparison.
If the Configuration layout direction is not changing don't indicate
that it has changed. When the indication is made incorrectly it
causes the window manager to believe that the configuration has
changed and it will start freezing the screen and setting up
animations. Bad jank is the result.

In Configuration.updateFrom() anytime that the screenLayouts were
different the code was setting ActivityInfo.CONFIG_LAYOUT_DIRECTION
in the return bitmask. Even if the only difference was between
UNDEFINED fields. This fix makes sure that the layout direction
field has actually changed before setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask.

In Configuration.diff() if the passed Configuration had
SCREENLAYOUT_LAYOUTDIR_UNDEFINED the code was setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask. This fix
makes sure that if the passed Configuration has fields set to
SCREENLAYOUT_*_UNDEFINED then corresponding bits will no longer be set
in the returned bitmask.

Fixes bug 10291622.
Fixes bug 10247094.

Change-Id: If26de662206fe85dc4671adbae39dfb99dc1038c
2013-08-13 09:23:13 -07:00
The Android Automerger
f1846ee1a4 merge in klp-release history after reset to klp-dev 2013-08-13 06:02:22 -07:00
Baligh Uddin
61c9706bac am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '43e56c4a911c8d192b3e8cc1c6de664e8755cb73':
  Import translations. DO NOT MERGE
2013-08-13 00:33:35 -07:00
Baligh Uddin
dc5f592c03 am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '78f5ef7143bb00c49e181197445ff20c2c5076f6':
  Import translations. DO NOT MERGE
2013-08-13 00:30:01 -07:00
Baligh Uddin
43e56c4a91 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-13 07:29:07 +00:00
Baligh Uddin
78f5ef7143 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-13 07:25:29 +00:00
Svetoslav Ganov
51843f8aa9 am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev
* commit '371c46fe29ed4c1b700cc40d49cc50f0cb70ebfa':
  Remove exceptions from the printer discovery session APIs.
2013-08-12 22:35:59 -07:00
Svetoslav Ganov
371c46fe29 Merge "Remove exceptions from the printer discovery session APIs." into klp-dev 2013-08-13 05:31:24 +00:00
Svetoslav Ganov
18d9c3cc6c Remove exceptions from the printer discovery session APIs.
It is not possible for a client to check whether the session is not
closed and add/update/remove printers atomically. It is always possible
that in between the two method calls the session is closed. Therefore,
we cannot enforce the exceptions.

Change-Id: If0e89e4429c4c360515da8f4bbe0ea3781e8e8fd
2013-08-12 22:22:49 -07:00
Jeff Sharkey
02e4d16ed9 Add GIDs to packages.list, update SD card perms.
Write supplementary GIDs to packages.list for lower-level system
components to parse.

WRITE_EXTERNAL_STORAGE also implies sdcard_r GID. Switch to always
enforce READ_EXTERNAL_STORAGE permission. Update permission docs to
mention new behavior.

Change-Id: I316ba4b21beebb387ac05c80980ae9b38235b37d
2013-08-12 20:31:36 -07:00
Jose Lima
0d27bc2946 am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev
* commit '56e0d6b86cd46095afae00781eb59c7ed5a7eab6':
  Allow configuration of Toast gravity settings
2013-08-12 19:27:47 -07:00
Jose Lima
56e0d6b86c Merge "Allow configuration of Toast gravity settings" into klp-dev 2013-08-13 02:24:35 +00:00
David Christie
8810a0c3c2 am 69b9eff1: Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means. Quick settings will no longeer explicitly enable/disable gps and network providers." into
* commit '69b9eff155254f1c274b8adbbf5501ddec4da089':
  Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means.  Quick settings will no longeer explicitly enable/disable gps and network providers.
2013-08-12 18:47:21 -07:00
Kristian Monsen
c319ddd9ec am 4c737496: Merge "Change the exception msg" into klp-dev
* commit '4c737496142085a7354e6aa663c09b5dd5a83633':
  Change the exception msg
2013-08-12 18:47:19 -07:00