112330 Commits

Author SHA1 Message Date
Dianne Hackborn
a2067473e8 Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
Change-Id: Id6432fc1b62db41c6c291ec08450c2fc37ced899
2013-09-20 10:54:16 -07:00
Robert Greenwalt
540784f903 Merge "Cleanup the shutdown of BatchedScans." into klp-dev 2013-09-20 17:43:30 +00:00
Svetoslav
b206f1271d Null not handled when parsing media size resource id attribute.
bug:10835715

Change-Id: I0c9c1120c26e68b4c582599bbda3753d0e443d8c
2013-09-20 10:43:29 -07:00
Robert Greenwalt
81fec6be04 Supsend/resume batched scans around dhcp.
Scanning while dhcp is running breaks dhcp, so stop the batched scans
when we need dhcp and start it up again after.

bug:10691401
Change-Id: Ifdeb6f35cfe4509b90fed1e1e694d0c107f24a7e
2013-09-20 10:13:46 -07:00
Vinit Deshapnde
0fd3b1be14 Fix incorrect exception being thrown from WifiConfiguration
Bug: 10817189

Change-Id: Ib2985f50080cb9d983a6de6ce668223e8782c3b6
2013-09-20 10:12:30 -07:00
Scott Main
562ce888af am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs
* commit '8f6ed205a2523a8170cdd3e824170fd77c4fd65a':
  add custom head tag to verify developers@android.com as site owner
2013-09-20 10:10:22 -07:00
Scott Main
8f6ed205a2 am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs
* commit '208e6079b4ccd161de198553319d285711564ea2':
  add custom head tag to verify developers@android.com as site owner
2013-09-20 10:07:46 -07:00
Scott Main
208e6079b4 am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs
* commit '0333302ad7162f66404c08e1c6c5b6b767aa78b3':
  add custom head tag to verify developers@android.com as site owner
2013-09-20 10:04:26 -07:00
Scott Main
0333302ad7 Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 2013-09-20 16:58:39 +00:00
Robert Greenwalt
82f4218c0d Cleanup the shutdown of BatchedScans.
Fixes binder-death as well as disambiguation when an app has multiple requests in.

bug:10641931
Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923
2013-09-20 16:32:47 +00:00
John Spurlock
560d2e463e Merge "Include starting windows in the sysui vis calculation." into klp-dev 2013-09-20 16:25:30 +00:00
Scott Main
9bcea321af add custom head tag to verify developers@android.com as site owner
Change-Id: I1a79669ab1e30de152354fafe5e397d5d1598f15
2013-09-20 09:10:08 -07:00
John Spurlock
79da83347a Include starting windows in the sysui vis calculation.
Sysui vis needs to be recomputed in the same code path as showing/
hiding the system bar (code path = finishPostLayoutPolicyLw) so
it can perform the new fade in/fade out to transparent modes at
the correct time.

Turns out no new state tracking is required, we already keep track
of this window as mTopFullscreenOpaqueWindowState.

So prefer mFocusedWindow when computing sysui vis as before,
but if null fallback to mTopFullscreenOpaqueWindowState.

Bug:10561554
Change-Id: I492766989a67fdac4f030451dcf00f6741a556c0
2013-09-20 12:04:47 -04:00
Maggie Benthall
db93e1d79e Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev 2013-09-20 14:30:29 +00:00
Daniel Sandler
4e6f752f23 Put soundpooled sounds in the right place.
Bug: 10846839
Change-Id: I5318c2d54ea0e25fa74bbafc35fb4f7a2883b351
2013-09-20 00:27:01 -04:00
Jim Miller
3855b99ff0 Fix the build - replace broken assets.
Change-Id: If039dee6d7e663d6abacd5239557d4d0a07fc912
2013-09-19 20:01:56 -07:00
Jeff Sharkey
a9ce049db8 Load RootInfo in background, invalidation.
Move all RootInfo queries to background threads to avoid janking
the UI.  Update passes happen on spawed task, which swaps out updated
cache results when finished.  Support partial updates when only a
single package/authority has changed.  Watch for change notifications
for roots, since flags can change over time.

Ignore stopped packages when in background, but query them for roots
when launching any picker UI.

Optimize management launches by treating as one-shot requests that
don't need to wait for all RootInfo.

Bug: 10600454, 10745490
Change-Id: Ibc7b15688ef6b41bd7e9dd0d7564b501e60e49a9
2013-09-19 19:53:32 -07:00
Michael Jurka
bdac73fec8 Merge "Fix default wallpaper dimensions" into klp-dev 2013-09-20 02:33:47 +00:00
Michael Jurka
8b4836085b Fix default wallpaper dimensions
Bug: 10834711
2013-09-20 04:32:20 +02:00
Christopher Tate
3301f76b23 Merge "Don't back up apps in the 'stopped' state" into klp-dev 2013-09-20 02:16:10 +00:00
Igor Murashkin
5c9eaf6796 camera2: Add more camera device states, make #openCamera async.
* Move CAMERA_IN_USE, MAX_CAMERAS_IN_USE to StateListener#onError
* Copy CAMERA_DISABLED to StateListener#onError

Bug: 10360518
Change-Id: Idd8cf42e1511d12682018588b2b413116cf65116
2013-09-19 19:01:32 -07:00
Jim Miller
af638c4f9d Merge "Add camera affordance to navigation bar on phones" into klp-dev 2013-09-20 01:33:28 +00:00
Svetoslav Ganov
22cb9170d3 Update android.print.PrintAttributes documentation
bug:10550844

Change-Id: Ic1bbb2cb6ab55826eb66242f6002b7165aff37a4

Conflicts:
	core/java/android/print/PrintAttributes.java
2013-09-19 18:31:48 -07:00
Svetoslav
facc08c775 Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 2013-09-20 01:14:02 +00:00
Craig Mautner
12946530cf Merge "Only show launcher for the bottom activity in a task" into klp-dev 2013-09-20 00:51:20 +00:00
David Braun
3372cb2654 Merge "Add config setting for default sms app." into klp-dev 2013-09-20 00:26:32 +00:00
Craig Mautner
f51b5588d7 Only show launcher for the bottom activity in a task
When transitioning from activity-over-launcher to task-over-launcher
ensureActivitiesVisibleLocked() was too aggressive in showing the
launcher. If there were any non-fullscreen activities in a task that
sits over the launcher then the launcher would be shown.

This fix adds a test to make sure the launcher will only be shown if
the bottommost activity in such a task is non-fullscreen.

Fixes bug 10840919.

Change-Id: I5dcd63be3fa2865ae38cbb921332937dfa4b5d47
2013-09-19 17:19:51 -07:00
Chet Haase
9b985721da Add equals() and hashcode() to SpannableString
ActionBar uses a transition to animate text changes. This transition
depends on testing the equality of start/end text values in CharSequence
objects. Without equals(), SpannableString will return false for objects
whose references are different, but whose text is exactly the same.

This CL adds the equals() method, and the accompanying hashcode method,
to ensure that two Spanned implementations will always be equal
if their text and span data are equal.

Issue #10760075 Wrong unread count in actionbar

Change-Id: I5e77d40dd302eca035e8c56d40f3cd0aef8e6424
2013-09-19 17:18:55 -07:00
Jim Miller
caf24fc2c4 Add camera affordance to navigation bar on phones
This adds a camera button on phones that can be used to show
and launch the camera.

- Minor refactoring of touch event dispatch in PagedView.
- Disables usability hints when keyguard loads.
- Only add a touch handler for camera icon once during layout.
- Update after review.
- Updated with latest UX camera and camera background assets

Change-Id: I09cd5cb0e501fd0f4659bea96d00c92b07f805c4
2013-09-19 17:14:59 -07:00
Svetoslav
6811f4e92c Move PdfDocument to android.graphics.pdf
1. Move PdfDocument to android.graphics.pdf.

2. Changed the PdfDocument as per API concil request.

3. Updated the documentation.

bug:10461180
bug:10552565
bug:10681585
bug:10552336

Change-Id: I08e15b34cf37bb064248c887e6f59808019cafe8
2013-09-19 17:12:47 -07:00
Christopher Tate
9ac23d0952 Don't back up apps in the 'stopped' state
E.g. right after install from the Play Store, or after a force stop.

Bug 10845317

Change-Id: I7764ce61caa77136ca2758657f111928f9740fc0
2013-09-19 17:12:27 -07:00
Glenn Kasten
9d53e30e5e Merge "Workaround for slow AudioRecord destructor" into klp-dev 2013-09-20 00:08:58 +00:00
Joe Fernandez
a17309fd9e am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs
* commit '41c3c2b687fa19d10c450a6d4b0b9f9a707a3854':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
2013-09-19 16:50:16 -07:00
Joe Fernandez
41c3c2b687 am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs
* commit '6e3b21cc83da2b227704b9a6b0cbad258ea5bd84':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
2013-09-19 16:47:56 -07:00
Glenn Kasten
8d87d7ba11 Workaround for slow AudioRecord destructor
Bug: 10816117
Change-Id: If59028bc7dc7abb84e1e3642c721c2629653631f
2013-09-19 16:46:04 -07:00
Joe Fernandez
6e3b21cc83 am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs
* commit '72f65780c77f9c0c306fcb53efeb62fbeba3899c':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
2013-09-19 16:44:58 -07:00
Joe Fernandez
27f525c422 am 354b4fef: am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes
* commit '354b4fef036ef9e57d79bf70a6988be92a9813eb':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
2013-09-19 16:44:44 -07:00
Ed Heyl
812c4d7378 Merge "fix typo" into klp-dev 2013-09-19 23:43:25 +00:00
Joe Fernandez
72f65780c7 Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 2013-09-19 23:41:39 +00:00
Joe Fernandez
354b4fef03 am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes
* commit '0d8f0849ff842ed7ce16f183207ed7ebbc7bac7e':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
2013-09-19 16:41:07 -07:00
Joe Fernandez
0d8f0849ff am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes
* commit '1d65500d6e16e497774dbff3b5d94cfd5256d118':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
2013-09-19 16:38:06 -07:00
Joe Fernandez
cedec4560e docs: Fix for SDK 22.2.1 Windows download checksum and size
external bug: http://b.android.com/60257

Change-Id: I399d21fd792c7c9a1bfac4402bc76fa23d45415b
2013-09-19 16:32:28 -07:00
Ed Heyl
6e65cb47dc fix typo
Change-Id: I97df15ea7d349e0224e1830d7327dde87e840a51
2013-09-19 16:25:57 -07:00
Leon Scroggins III
57989c0e04 Merge "Skip writing zeroes to java allocated memory." into klp-dev 2013-09-19 23:19:13 +00:00
David Braun
b2bae41b82 Add config setting for default sms app.
Different devices can have different default SMS apps.

Bug: 10818725 Allow OEM to specify or override a default SMS app (package)
Change-Id: I02cee9a3276ae39838cda181c9911041c81ea399
2013-09-19 16:13:04 -07:00
Victoria Lease
ddc0a63d8f Merge "fix emoji clipping in hw draw path" into klp-dev 2013-09-19 22:46:50 +00:00
Amith Yamasani
722b15e000 Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev 2013-09-19 22:42:50 +00:00
Victoria Lease
16c84069a4 fix emoji clipping in hw draw path
I guess we don't want to overwrite the last line in every RGBA glyph
with our one-line texture atlas spacer?

Bug: 10841207
Change-Id: Ief85ca58650c731e9d21dbf90942b7b44670abcc
2013-09-19 15:38:21 -07:00
Eino-Ville Talvala
a84ca8a3ca Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-dev 2013-09-19 21:56:09 +00:00
Dianne Hackborn
70817c479a Merge "Implement issue #10691475: Kill cached processes if about to..." into klp-dev 2013-09-19 21:44:20 +00:00