111921 Commits

Author SHA1 Message Date
Ying Wang
930d4e52ad Fix docs build.
Change-Id: I4a1608bfad809d67240db2070fda85df486179e6
2013-09-14 11:57:17 -07:00
Wink Saville
78d0cf7958 Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev 2013-09-14 18:19:39 +00:00
Maggie Benthall
f5aba5ad1e Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 2013-09-14 18:00:13 +00:00
John Spurlock
b9b2fa9249 Despotted back.
Bug:9795248
Change-Id: If46134afe7560b74ce7758f8dbe221dbe2872262
2013-09-14 12:17:15 -04:00
Wink Saville
127beffb05 Tighten condition for calling checkMobileProvisioning.
Add the condition that the connected network needs to be TYPE_MOBILE.
This eliminates checking on connecting to secondary networks like
FOTA, MMS, SUPL ...

This reduces unnecessary attempts to bring up multiple connections at
the same time. Especially in the light of the trouble we're having with HFA
on Sprint, where we don't want to connect to any other network until HFA
has completed.

Bug: 10758001
Change-Id: Id294536b70304a51de4752bc1a4ffac734f10f1a
2013-09-14 09:04:53 -07:00
Michael Jurka
276e6c7a89 Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 2013-09-14 12:25:51 +00:00
Svetoslav Ganov
860f8a6b66 Spooler should not crash if print service config activities are not exported.
1. If a print service does not export its activities for settings and
   adding printers the print spooler ignores them instead of crashing.
   Also if the service is not enabled its activities are now ignored.

2. Added a dedicated permission for a print service to optionally
   protect its settings and add printer activities such that only the
   system can bind to them.

3. Fixed a crash in the print dialog if its content is detached
   from the window and animators are running.

bug:10680224

Change-Id: I20b57d6622a15f9b2352ba78d04c44e67b316a15
2013-09-14 01:00:55 -07:00
Igor Murashkin
e3351f1942 media: Update ImageReader to remove MaxImagesAcquiredException
* acquiring images now throws IllegalStateException instead of
    MaxImagesAcquiredException

Bug: 10691447
Change-Id: I7ce68f990fb96703705b9181012a28633fea0b7a
2013-09-13 23:27:44 -07:00
Baligh Uddin
162e88759c Import translations. DO NOT MERGE
Change-Id: Idfb9ef96c1c4ea6fc1ca836114a8eb09be18f8f4
Auto-generated-cl: translation import
2013-09-13 21:47:27 -07:00
Baligh Uddin
2a19a5bd50 Import translations. DO NOT MERGE
Change-Id: I45033c9b90cdbf35e1feec31b91df21a27eaaf06
Auto-generated-cl: translation import
2013-09-13 21:45:23 -07:00
Baligh Uddin
c2d91d5a31 Import translations. DO NOT MERGE
Change-Id: Ic9f16e364544b1366e92d26552b27a01dc1d57c5
Auto-generated-cl: translation import
2013-09-13 21:14:47 -07:00
Chet Haase
750ce3acf2 Merge "Only buildLayer() on attached views" into klp-dev 2013-09-14 03:39:45 +00:00
Dirk Dougherty
c8db445e42 am a99cc3a7: am 788fc628: am 6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs
* commit 'a99cc3a72d7ff883b8ade7e119169b561fc98e17':
  Update documentation for speech APIs.
2013-09-13 19:59:29 -07:00
Dirk Dougherty
a99cc3a72d am 788fc628: am 6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs
* commit '788fc6285a0b7f1585c5a4fa68599af7c07747e5':
  Update documentation for speech APIs.
2013-09-13 19:56:03 -07:00
Dirk Dougherty
788fc6285a am 6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs
* commit '6212f6b3c5c92298fedbb37f5ceb0094b770549b':
  Update documentation for speech APIs.
2013-09-13 19:53:26 -07:00
Dirk Dougherty
6212f6b3c5 Merge "Update documentation for speech APIs." into jb-mr2-docs 2013-09-14 02:50:16 +00:00
Scott Main
c8aeb95df1 am 19612c63: am 575245dc: am 1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
* commit '19612c63519dce47b1cbe03d1691ec66f7160c44':
  update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
2013-09-13 19:39:15 -07:00
Scott Main
19612c6351 am 575245dc: am 1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
* commit '575245dc29441fc796442805caa16000f48f27cc':
  update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
2013-09-13 19:36:49 -07:00
Scott Main
575245dc29 am 1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs
* commit '1294a8f9a2ccc4e19d218dbe8645ddac533706d8':
  update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
2013-09-13 19:33:17 -07:00
Scott Main
1294a8f9a2 Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs 2013-09-14 02:31:08 +00:00
Scott Main
808eb3ad33 update samples landing page with summaries based on parameter in the url.
This is just for testing purposes... no real functionality yet.

Change-Id: I7d18033b01a7c3615e3d998da71062b25af22b28
2013-09-13 19:29:54 -07:00
Geoff Mendal
c028d8f05c Merge "Disable ActionBar transitions" into klp-dev 2013-09-14 02:08:20 +00:00
Chet Haase
5fd37236df Only buildLayer() on attached views
A recent change to ViewPropertyAnimator.withLayer() builds the layer
immediately after creating it. This works in general, but if the view
is not attached, buildLayer() throws an exception.

The fix is to ensure that the view is attached before calling buildLayer().

Issue #10750925 Dialer crashed and phone dropped while on call

Change-Id: I801c835a0f5cb81e159fe90c157c122cf2d0da01
2013-09-13 19:01:52 -07:00
Igor Murashkin
7a36a0fbb0 camera2: Add key enumeration functionality to CameraMetadata
* Add a way to enumerate all currently set keys in CameraMetadata
* Add a way to enumerate all available keys for CaptureRequest
* Add a way to enumerate all available keys for CaptureResult
* No way to enumerate all keys for CameraProperties, since it would be
  identical to all the currently set keys.

Bug: 10360518
Change-Id: I3a90f8cc385db14a675e4ff876ae93d906ff06bf
2013-09-13 19:00:15 -07:00
Chet Haase
7d077d0364 Disable ActionBar transitions
A problem with transitions is causing various ActionBar icons to go
missing occasionally. This CL disables these transitions for now
to allow ActionBar to work as expected.

Issue #10726905 ActionBar weirdness in People app

Change-Id: I0cb774840ae84cbb733d65865f8c1b4c6d7490fa
2013-09-13 18:51:12 -07:00
Dianne Hackborn
e39ced0f7c Merge "Maybe fix issue #10748810: Runtime restart: crash under..." into klp-dev 2013-09-14 01:43:20 +00:00
Dianne Hackborn
a0332377e1 Maybe fix issue #10748810: Runtime restart: crash under...
...ActivityManagerService.setProcessTrackerState

And if not, at least we'll have a little more debug info
when it happens again.

Change-Id: I685f0f72c2e1b17608a8d069d6c7f2cff2fd0abd
2013-09-13 18:34:13 -07:00
Scott Main
296fbce89c am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory()
* commit 'bb3b431dc6b5786bed7cc988f44c35df21408a93':
  more javadocs for onTrimMemory()
2013-09-13 18:09:45 -07:00
Scott Main
bb3b431dc6 am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory()
* commit '8bf0c9ae604e5114260159077bfafbdd9d16a7ea':
  more javadocs for onTrimMemory()
2013-09-13 18:06:28 -07:00
Dianne Hackborn
fc9122ecae Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev 2013-09-14 01:04:05 +00:00
Scott Main
8bf0c9ae60 am a23fd887: more javadocs for onTrimMemory()
* commit 'a23fd88729bd10c02a9d631c9954616b3a1d0f6f':
  more javadocs for onTrimMemory()
2013-09-13 18:03:18 -07:00
David Christie
5f68f71701 Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 2013-09-14 01:02:40 +00:00
Scott Main
a23fd88729 more javadocs for onTrimMemory()
Change-Id: I52a99bc1b07732e474d1c632f3021c6c4db8c5ab
2013-09-13 17:57:16 -07:00
Igor Murashkin
b779ac1e2e camera2: Update Face class.
- Move Face to be outer class. Enables Parcelable-izing it later.
- Add static public constants for field values.
- Add @hide constructors.
- Rename methods returning Point to have Position suffix.
- Add new key android.statistics.faces (CaptureResult#STATISTICS_FACES)

Bug: 10360518
Bug: 10549293
Change-Id: I067f06f0426114b2c3a3266ca7e00e6cb1d89046
2013-09-13 17:42:26 -07:00
David Christie
6ab2284c98 Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
Change-Id: I69bd7ce9e942c2f9327415b2821d805e1b50a1a4
2013-09-13 17:34:40 -07:00
Dianne Hackborn
7e7144218e Implement #10666712: NetworkOnMainThreadException should be...
...relayed back to calling application

What's one more exception between friends?

Change-Id: Ib83c7bfbddd397457dcdbe506a8cd2bc0f4fb70b
2013-09-13 17:32:57 -07:00
Adam Powell
50e5814c33 Merge "Check RelativeLayout's access of its own LayoutParams during measurement" into klp-dev 2013-09-14 00:23:07 +00:00
Dianne Hackborn
76adfd71f1 Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 2013-09-14 00:22:06 +00:00
Dianne Hackborn
3fa8969021 Fix issue #10461477: KLP API Review: Debug.MemoryInfo
Oops.

Change-Id: I2143790af9e6649dba8d74618358c47232cf6cc4
2013-09-13 17:20:00 -07:00
Jeff Tinker
fff175aedc Merge "Part of corrections from KLP API Review: Media" into klp-dev 2013-09-14 00:16:34 +00:00
Chris Craik
0d3c52d3af Merge "Fix merged operation clipping" into klp-dev 2013-09-14 00:12:37 +00:00
Christopher Tate
0f8ec44b13 Merge "Prune shared users that the system declares but does not use" into klp-dev 2013-09-14 00:11:48 +00:00
Glenn Kasten
0f3e1487b2 Merge "Remove obsolete assets from target /system/media/video/" into klp-dev 2013-09-14 00:07:44 +00:00
Dianne Hackborn
236afa0d8b Merge "Fix issue #10747324: adb install hangs" into klp-dev 2013-09-14 00:04:43 +00:00
Dianne Hackborn
2e46bb5d88 Fix issue #10747324: adb install hangs
Dumb typo was clearing the wrong service array, causing
us to sometimes forget we were launching a service.

Change-Id: Ie1aba0e07d19e85a104a5985e3cead5f28a0556a
2013-09-13 17:01:26 -07:00
Christopher Tate
86b391cd03 Prune shared users that the system declares but does not use
Bug 10184643

Change-Id: I72c5177c621c24fac34bf8744eb6c5108b6d3464
2013-09-13 16:58:36 -07:00
Adam Powell
3157e73fb0 Merge "Don't recycle action button views" into klp-dev 2013-09-13 23:46:38 +00:00
Rachad Alao
4fe6429ba2 Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 2013-09-13 23:44:44 +00:00
Jeff Sharkey
12c7a0c970 Merge "More UX updates around picking images." into klp-dev 2013-09-13 23:33:27 +00:00
Craig Mautner
540421ba98 Merge "When launching home activity, make sure it is top." into klp-dev 2013-09-13 23:33:17 +00:00