Commit Graph

32157 Commits

Author SHA1 Message Date
Jeff Sharkey
f534dc6c36 am 94bf4d69: am 0156a379: Merge "Allow saving to Downloads." into klp-dev
* commit '94bf4d69f2e59a0bb62c5d1829e4cf9be5a67579':
  Allow saving to Downloads.
2013-09-24 10:22:53 -07:00
Amith Yamasani
d94c31d13a am 32a2775e: am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev
* commit '32a2775e529d13dfd34273a3b4af5151435720b2':
  Unmarshall PFDs properly when hand-crafting interface stubs
2013-09-24 10:22:50 -07:00
Dianne Hackborn
9ef68ecda5 am 8d4816d8: am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev
* commit '8d4816d8fc9c1acbf377e7ee50b9871c4b5b8028':
  Issue #10461551: KLP API Review: AppOpsManager
2013-09-23 19:04:00 -07:00
Jeff Sharkey
94bf4d69f2 am 0156a379: Merge "Allow saving to Downloads." into klp-dev
* commit '0156a379e21621d2724635eb96f37a81efc7be06':
  Allow saving to Downloads.
2013-09-23 19:00:01 -07:00
Amith Yamasani
32a2775e52 am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev
* commit '85f77c2b8b46a52544ab9305a8c4cf9a36923013':
  Unmarshall PFDs properly when hand-crafting interface stubs
2013-09-23 18:59:57 -07:00
Dianne Hackborn
8d4816d8fc am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev
* commit 'a3abca90aea1b0b6ab0be56b3ec008b91dfc090f':
  Issue #10461551: KLP API Review: AppOpsManager
2013-09-23 18:58:42 -07:00
Jeff Sharkey
0156a379e2 Merge "Allow saving to Downloads." into klp-dev 2013-09-23 21:28:07 +00:00
Jeff Sharkey
b180a65d41 Allow saving to Downloads.
Uses new column to mark writability.  Also filter file selection in
create mode to only allow writable files.

Bug: 10667164, 10893268
Change-Id: I90f74efbb7ac634fbdb3cc02a904a96a434d3605
2013-09-23 14:23:45 -07:00
Amith Yamasani
85f77c2b8b Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev 2013-09-23 21:14:51 +00:00
Amith Yamasani
c2be0d6183 Unmarshall PFDs properly when hand-crafting interface stubs
ParcelFileDescriptors now carry an optional socket fd to communicate
close events. So, make sure that the correct creator is called when
reconstructing parceled PFDs.

Bug: 10759966
Change-Id: Ic6b9ffb8cb7af5f3a12440def595f74682231866
2013-09-23 13:35:46 -07:00
Dianne Hackborn
a3abca90ae Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev 2013-09-23 16:36:29 +00:00
Dianne Hackborn
9bb0ee9131 Issue #10461551: KLP API Review: AppOpsManager
Changed public constants from integers to strings.  Internally
everything is still integers, since we want that more efficient
representation for most things.

Changed the Callback interface to OnOpChangedListener.  We also
have a private versin that again takes an int, and tricks to
make both work.

Reworked the class documentation to be appropriate to the SDK
(as much as it can be); most of the existing documentation is
moved to the private implementation.  Also added documentation
of the MODE constants.

Change-Id: I4f7e73cc99fe66beff9194e960e072e2aa9458f8
2013-09-23 09:35:21 -07:00
Jeff Sharkey
a440a0dd64 am b8a48da2: am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev
* commit 'b8a48da2a707720a105584f1b8dc087a6dd9c887':
  Create unique files, root ordering, UI bugs.
2013-09-22 12:59:40 -07:00
Jeff Sharkey
b8a48da2a7 am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev
* commit '5e1a5e5bad475696e842addceb7dd6a519879f98':
  Create unique files, root ordering, UI bugs.
2013-09-22 12:57:20 -07:00
Jeff Sharkey
5e1a5e5bad Merge "Create unique files, root ordering, UI bugs." into klp-dev 2013-09-22 19:55:19 +00:00
Igor Murashkin
f17285c465 am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev
* commit '8c87117588a1158823d94dec365897d33cec59bf':
  camera2: Rename CameraProperties to CameraCharacteristics
2013-09-22 09:57:40 -07:00
Igor Murashkin
8c87117588 am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev
* commit '3ba21e979524367631de70dfc82075693d9c616d':
  camera2: Rename CameraProperties to CameraCharacteristics
2013-09-22 09:55:52 -07:00
Igor Murashkin
68f40066c9 camera2: Rename CameraProperties to CameraCharacteristics
Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
2013-09-21 21:01:32 -07:00
Igor Murashkin
b960357438 am 78d5286e: am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev
* commit '78d5286e0711092d1ec919c4524bfba9230d11d0':
  camera2: Add capture sequences and capture failures
2013-09-21 19:54:14 -07:00
Igor Murashkin
78d5286e07 am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev
* commit 'ca833c389b3cc2f95f27fe7782d0bebb8b36d660':
  camera2: Add capture sequences and capture failures
2013-09-21 19:49:34 -07:00
Igor Murashkin
ca833c389b Merge "camera2: Add capture sequences and capture failures" into klp-dev 2013-09-22 02:44:06 +00:00
Wink Saville
4d154af68f am 86ad8e68: am 56065891: Merge commit \'53221120\' into fix-merge-conflict
* commit '86ad8e6871e778e1ee47d4f723bbd1d5f8fc00bf':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 14:39:42 -07:00
Wink Saville
86ad8e6871 am 56065891: Merge commit \'53221120\' into fix-merge-conflict
* commit '56065891abf383b0409ae595437dcb0ea132e32b':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 14:36:13 -07:00
Jeff Sharkey
5545f56f75 Create unique files, root ordering, UI bugs.
When a file already exists on disk, try adding a counter suffix to
make a unique name.  Move services near top of roots list, just below
recents.  Remove "Documents" root.

Increase number of recents allowed from single provider, and add more
logging to diagnose wedged loaders.

When launching GET_CONTENT apps, wait for successful result before
relaying result; canceled requests now return to DocumentsUI.

Add CloseGuard to ContentProviderClients, since leaked instances can
keep the remote process alive.

Fix UI bug around trailing breadcrumbs.  Fix bug that dropped Recents
from roots list.  Add up action to Settings activity.  Give our
activity a default icon while waiting for async roots to load.

Bug: 10818683, 10819461, 10819461, 10819196, 10860199
Change-Id: I7b9e26b1cf8353dd3175458b23da2b4bda6c5831
2013-09-21 14:07:16 -07:00
Wink Saville
56065891ab Merge commit '53221120' into fix-merge-conflict
* commit '53221120':
  Do not always call setIsConnectedToProvisioningNetwork(false)

Conflicts:
	core/java/android/net/MobileDataStateTracker.java

Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597
2013-09-21 11:52:42 -07:00
Wink Saville
5322112004 am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
* commit 'ab8cabf1d3e5d5fd1fff17816fbc4ab19e8f1a8e':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 11:33:53 -07:00
Wink Saville
ab8cabf1d3 am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
* commit '1e4f461839ebd3c9d3dc62232c2eac7d8cbdc467':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 11:30:33 -07:00
Jonathan Dixon
90102e2ccc resolved conflicts for merge of 1421827b to master
Simple resolve: two new methods added to same class.

Conflicts:
	core/java/android/webkit/WebViewFactoryProvider.java

Change-Id: Ic8b26f2a51279348b19a9c5b30d492f67d62ca81
2013-09-21 10:48:28 -07:00
Wink Saville
1e4f461839 Do not always call setIsConnectedToProvisioningNetwork(false)
Previously I was calling setIsConnectedToProvisioningNetwork(false) always,
but all MDST's receive every broadcast. Thus we could over write an MDST's
mNetworkInfo.mIsConnectedToProvisioningNetwork to false, unless the MDST
that was set to true was last, i.e the code was order dependent.

If the provisioning networks value was false instead of true
when handleMobileProvisioningAction was called we wouldn't invoke
mdst.enableMobileProvisioning because network info would be null.

Thus the provisioning network would never transition to CONNECTED and
a default route wouldn't get setup and the browser couldn't access the
website.

Now setIsConnectedToProvisioningNetwork is only set to false when the
apnType matches and we won't indiscriminately change it and are not
order dependent.

Bug: 10853805
Change-Id: I68a4f9bdf5dc18d90f4cdef7a60811f57be67261
2013-09-21 09:01:19 -07:00
Jonathan Dixon
1421827bae am 6c025eaf: Merge "WebView: add an API method to control web contents debugging" into klp-dev
* commit '6c025eaf29634d248bf067c2d9967e1905863f0c':
  WebView: add an API method to control web contents debugging
2013-09-20 20:44:26 -07:00
Jonathan Dixon
6c025eaf29 Merge "WebView: add an API method to control web contents debugging" into klp-dev 2013-09-21 03:41:33 +00:00
Svetoslav Ganov
887a192ee1 am 18e3ca0f: am 678e907e: Merge "Update android.print.PrintAttributes documentation" into klp-dev
* commit '18e3ca0f148f2cd0390d417059fc7d5ae8c0c061':
  Update android.print.PrintAttributes documentation
2013-09-20 19:48:33 -07:00
Svetoslav Ganov
18e3ca0f14 am 678e907e: Merge "Update android.print.PrintAttributes documentation" into klp-dev
* commit '678e907e09388dff8b2955bb524c2706f067a6ef':
  Update android.print.PrintAttributes documentation
2013-09-20 19:44:03 -07:00
Svetoslav Ganov
678e907e09 Merge "Update android.print.PrintAttributes documentation" into klp-dev 2013-09-21 02:39:59 +00:00
Igor Murashkin
6bbf9dc5ae camera2: Add capture sequences and capture failures
- CaptureResult#getRequest is used to tie a result to a request (for convenience)
- Add new CaptureFailure class to describe capture failure
- Results/frame numbers also return frame numbers, sequence ids
- Captures now all return the sequence id
- A sequence id onComplete is available in the CaptureListener

Bug: 10360518
Change-Id: I9ebaa45698c718a1185b5ae920b7975925fe2f60
2013-09-20 19:00:50 -07:00
Dianne Hackborn
c430e0dc76 am 28db9c64: am 90d51b1a: Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev
* commit '28db9c64172c046118eede06a5cc6f8d729c50c8':
  Fix issue #10807048:  Groupon: The application crash when user rotates...
2013-09-20 18:30:43 -07:00
Dianne Hackborn
28db9c6417 am 90d51b1a: Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev
* commit '90d51b1abe64442927c7e6bdbafc99f41a55f393':
  Fix issue #10807048:  Groupon: The application crash when user rotates...
2013-09-20 18:25:44 -07:00
Svetoslav
69337346ab am 939d9592: am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev
* commit '939d95924a88f4376f301db72b95e096f69fda7f':
  Offer to enable a print service after it is installed.
2013-09-20 18:23:50 -07:00
Dianne Hackborn
90d51b1abe Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev 2013-09-21 01:21:26 +00:00
Svetoslav
939d95924a am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev
* commit 'b39ce63d2807c9d5c68d3be052dee7e9da7ec3be':
  Offer to enable a print service after it is installed.
2013-09-20 18:18:36 -07:00
Selim Gurun
abb6fbdfb8 Merge "Trace extra headers set by loadurl." 2013-09-21 01:17:25 +00:00
Svetoslav
b39ce63d28 Merge "Offer to enable a print service after it is installed." into klp-dev 2013-09-21 01:15:47 +00:00
Dianne Hackborn
e784d1e4cf Fix issue #10807048: Groupon: The application crash when user rotates...
...device to another mode (portrait or landscape) on Main page.

So, it turns out that Bundle claimed to have an invariant that either
mParcelledData or mMap would hold its data, never both.  The new
implementation on top of ArrayMap assumed this was the case.  However,
there is one situation where it is not true: an application can take
an existing Bundle that contains data, and call readFromParcel() on it.
The implementation of readFromParcel() would just pull out the
parceled data and stuff it in to mParcelledData for later unparceling,
even if that Bundle already had a non-empty mMap.

To fix this, we just look for this case in readFromParcel() and
immediately unparcel at that point into the existing map, using a
new unparcelling method that doesn't rely on the target map being
empty.

Change-Id: Ib816b6876a6cd2760b7a3372c7a79ca2f12dfeba
2013-09-20 18:13:52 -07:00
Selim Gurun
90b48b2cde Trace extra headers set by loadurl.
When tracing webview, also trace application set headers.

Change-Id: Ie93cb1ad143072f4a34f6b18148ff21962c3a068
2013-09-20 18:08:46 -07:00
Svetoslav
d8f391b4e0 Offer to enable a print service after it is installed.
The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.

bug:10447510

Change-Id: Iea56c0825f0bf38328ad94912f0ea5576e9339b3
2013-09-20 17:40:25 -07:00
Raph Levien
0325fc366a am 12618bf7: am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining accent"" into klp-dev
* commit '12618bf7f58ec7a23c6e25db1eec41332727edf8':
  Fix for "Can't place cursor after combining accent"
2013-09-20 16:34:00 -07:00
Raph Levien
12618bf7f5 am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining accent"" into klp-dev
* commit '7c1b10872f3d57b3afdb0f070fcf602e4d72df37':
  Fix for "Can't place cursor after combining accent"
2013-09-20 16:31:22 -07:00
Raph Levien
7c1b10872f Merge "Fix for "Can't place cursor after combining accent"" into klp-dev 2013-09-20 23:27:57 +00:00
Igor Murashkin
c94a8322cb am 5b65ad41: am ab98a0b1: Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev
* commit '5b65ad41b2a748fe5c3c24107ffe767ce8a8d8dc':
  camera2: Add more camera device states, make #openCamera async.
2013-09-20 16:26:36 -07:00
destradaa
fb339b8a0f am 93d3bdb6: am 47d620ac: Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev
* commit '93d3bdb61a7c868d41a259b56af0914d2f6b2303':
  Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer
2013-09-20 16:26:33 -07:00