Commit Graph

33245 Commits

Author SHA1 Message Date
Amith Yamasani
3d38fa301c Merge "PreferenceActivity Fragment security" 2013-08-01 17:18:03 +00:00
Satoshi Kataoka
2f3efcf107 Merge "Cleanup InputMethodSubtype and add "isAsciiCapable"." 2013-08-01 08:26:47 +00:00
Satoshi Kataoka
dc8abf6cee Cleanup InputMethodSubtype and add "isAsciiCapable".
Bug: 8364845
Change-Id: Ic3ace4b6e0432d56696bcbc0be336aec1dc744a5
2013-08-01 17:17:48 +09:00
Lorenzo Colitti
e1cd293151 Merge "Add accessors for all addresses and clarify compare* methods" 2013-08-01 06:44:29 +00:00
Satoshi Kataoka
fd5d153af8 Merge "Add a debug utility for InputMethodUtils" 2013-08-01 03:12:35 +00:00
Satoshi Kataoka
87c2914215 Add a debug utility for InputMethodUtils
Change-Id: I59f6001bf20640e36e19b09cf117b8579120ba7d
2013-08-01 11:57:27 +09:00
Svetoslav Ganov
53672be110 Merge "Iteration of the print sub-system." 2013-08-01 02:16:20 +00:00
Svetoslav Ganov
55b409a97c Iteration of the print sub-system.
1. Added APIs for adding partially initialized PrintInfo objects
   enabling light-weight lookps for print serivces that want to
   populate the list of available printers without querying each
   of them for its capabilities. This includes APIs for the system
   to request from a print service to update certain printers.

2. Fixed a bug in PrinterId#equals().

3. Added equals and hasCode implementaion to PrinterInfo. Also
   the defaul in PrinterInfo are now an array instead of a
   SparseArray - cheaper.

4. Now PrintJobConfigActivity works with partially specified
   printers. Specifically, if such a printer is selected the
   activity is requesting from the print service to update
   the printer. We are currently not handling the timeout case.
   It also handles udpated pritners.

Change-Id: I5e83e924ef597c9e22cbd06a971d4f4d3bd3a9c1
2013-07-31 18:59:53 -07:00
Elliott Hughes
2a805f9304 resolved conflicts for merge of 368d81fe to master
Change-Id: I4bc59cd9a54cbc1b62ac135cf86dc73ac85968d5
2013-07-31 18:25:47 -07:00
Dianne Hackborn
bf83e0dd12 Merge "Fix issue #10115327: MapCollections need to implement equals" 2013-08-01 01:14:57 +00:00
Elliott Hughes
368d81fe18 am c67b2ed5: Merge changes I80eaecff,Ia2b4f79b
* commit 'c67b2ed50226c4758d0fc1434d39f6add6a0a533':
  Switch Process.myTid over to the libcore JNI too.
  Replace native Process getpid/getuid with calls to libcore equivalents.
2013-07-31 17:57:22 -07:00
Dianne Hackborn
8b7bc13e21 Fix issue #10115327: MapCollections need to implement equals
Change-Id: I8e7b6dd092442f3870aa1a36bd2a7cd974177146
2013-07-31 17:52:07 -07:00
Elliott Hughes
6d4b1e24ae Switch Process.myTid over to the libcore JNI too.
Change-Id: I80eaecff014fabf809f4be3c9ee8b26aa64bf0cf
2013-07-31 17:38:11 -07:00
Jeff Hao
406ec15647 Replace native Process getpid/getuid with calls to libcore equivalents.
The Process natives were getting called were getting called while
handling a jdwp packet before the vm had a chance to register them.

(cherry-pick of 5bce6a308fc8a3c1e449cf905b8b6e8ace4ef3e2.)

Change-Id: Ia2b4f79b11e427283a712b2d0c52948f394640bf
2013-07-31 17:19:23 -07:00
Svetoslav Ganov
9f1ef00265 Merge "Iteration on the print sub-system." 2013-08-01 00:13:44 +00:00
Wink Saville
552436d17b Merge "Fix excessive log spew." 2013-07-31 23:27:34 +00:00
Wink Saville
1aef7fc81a Fix excessive log spew.
Bug: 10115060
Change-Id: I61fd83071da1224f38757b8d90f58c8d6c41d36b
2013-07-31 15:49:04 -07:00
Dianne Hackborn
5b45f2366e am bd61ba5b: am a99cb5bc: (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...
* commit 'bd61ba5b22f55a70615e128310d365c6175a0a4e':
  (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...
2013-07-31 14:18:06 -07:00
Dianne Hackborn
a99cb5bc41 (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...
...when clipboard listener attached

We need to clear the calling identity before dispatching change
notifications.  Also make this more robust, so that in the face
of any failure we will clean up the broadcast state.

Integrated from master.

Change-Id: I05e1f76ffd486439535631fe4062dabe94bd2ccf
2013-07-31 13:48:39 -07:00
Zhijun He
bf11d5835e Merge "Camera2 API: Fix missing callback issue" 2013-07-31 20:45:04 +00:00
Zhijun He
ecb323e3ce Camera2 API: Fix missing callback issue
Callback/Listener classes must extend the AIDL Stub class and implement the
methods. Also rename the frameId to requestId to avoid confusion.

Change-Id: I1b2f0e2f99230917f9e0e1875ba3ba1c7859c805
2013-07-31 12:02:07 -07:00
Lorenzo Colitti
d1e0fae2bc Add accessors for all addresses and clarify compare* methods
1. Add a method to return all addresses and all LinkAddresses on
   all links (both base links and stacked links). We already had
   one for routes, but did not yet have any for addresses.
2. Rename compareRoutes to compareAllRoutes, because unlike the
   other compare* methods, it looks at all interfaces. Update
   what appears to be its only caller.
3. Update the documentation of the compare* methods to match
   reality (they don't return lists) and clarify whether they
   look at all links or only the base link.

Change-Id: Ie22e6c7f163d5de8e407248b45171dc28382d2d3
2013-08-01 00:21:24 +09:00
Ben Murdoch
46fc6a6e3b Merge "Revert "Flag-flip: set chromium to be the default WebView"" 2013-07-31 11:46:36 +00:00
Ben Murdoch
c9f10b6be9 Revert "Flag-flip: set chromium to be the default WebView"
We need to wait until GMail corruption fix is in.

This reverts commit 6716bd3375.

Change-Id: Ie3c335e18901d24d878f81fb76b7065520fa32e5
2013-07-31 11:27:33 +00:00
Satoshi Kataoka
0766eb045c Small refactor on InputMethodUtils
Change-Id: Ie4f797508c02abb13c7fe1be162ec4dc18829925
2013-07-31 18:33:48 +09:00
Ben Murdoch
5b537bf320 Merge "Flag-flip: set chromium to be the default WebView" 2013-07-31 09:14:11 +00:00
Ben Murdoch
dabc6fc8a9 Merge "Unhide WebView.evaluateJavascript(..)" 2013-07-31 09:13:27 +00:00
Jeff Sharkey
a1510c9849 Merge "Define storage roots, external GUIDs, creation." 2013-07-31 06:00:35 +00:00
Jeff Sharkey
20d96d8aff Define storage roots, external GUIDs, creation.
Allow storage backends to publish multiple roots into the UI, which
are defined by a directory GUID, type, and label details.  Update
external provider to surface a primary external storage root, and
switch to burning file path into the returned GUIDs so they remain
durable.

Added insert, update, and delete support to external provider. Adds
file extensions to display names when needed to match MIME type.

Add flags for searching and deletion, and extras for Cursor
pagination. Add directory creation dialog to UI. Opening a document
always gives write access.

Change-Id: I9bea1aa0dcde909a5ab86aefeece7451ab920cf1
2013-07-30 22:55:23 -07:00
Jonathan Dixon
6716bd3375 Flag-flip: set chromium to be the default WebView
For now, can still be disabled in Developer Settings.

Change-Id: Id871d1e232de7b3c7be42c7734f2bb83dc526b32
2013-07-30 20:26:52 -07:00
Christopher Tate
56cfa24412 Temporary stay of execution
Change-Id: I5d3b4213233f6326a8f7ee4891f1f71539649b8d
2013-07-30 19:09:41 -07:00
Dianne Hackborn
2841e0afac Merge "If you set an alarm before the epoch, you're gonna have a bad time" 2013-07-31 02:07:26 +00:00
Christopher Tate
5f221e8f93 If you set an alarm before the epoch, you're gonna have a bad time
For apps build against the KLP+ SDK, this will now throw an illegal argument
exception.  Legacy apps will simply see the alarm delivered immediately.

Bug 9965704

Change-Id: Ia103d9529d32640098be324820fe228efa95431d
2013-07-30 18:55:01 -07:00
Svetoslav Ganov
85b1f88305 Iteration on the print sub-system.
1.  API changes: Moved copies API from PrintAttributes to PrintJobInfo;
    Changed the PageRange list to an array in PrintDocumentAdapter#onWrite;
    Added onCancelled method to the layout and write callbacks.

2.  Refactored the serialization of remote layout and write commands. Now
    the commands are serialized by the code in the client instead in the spooler.
    The benefit is simple code since the client has to do a serialization to delegate
    to the main thread anyway. The increased IPC found is fine since these calls
    are quite unfrequent.

3.  Removed an unused file: IPrintSpoolerObserver.aidl

4.  Added equals and hasCode implementation to PageRange, PrintAttributes,
    MediaSize, Resolution, Margins, Tray, PrintDocumentInfo.

5.  Added shortcut path for query APIs on PrintJob that return cached values
    if the print job is in a uncuttable state, i.e. completed or cancelled. Failed
    print jobs can be restarted.

6.  PrintJobInfo was not properly serialized.

7.  Updated the look of the print dialog to be stable if there is and there isn't
    currently selected printer.

8.  PrintJobCOnfigActivity now calls onLayout on every print attributes change
    but requests a write only on print preview or print button press. Also if the
    layout did not change the content and it is already written no subsequent
    call is made. Also if the selected pages change and we already have them
    no subsequent call to write is made. Also the app is called with print preview
    attribute set when performing layout and with it cleared after the print button
    is pressed. A lot of changes making sure that only valid actions are enabled
    in the activity (looks like a dialog) at a given time frame. The print job config
    activity is also hidden after we got all the data, i.e. layout and write are done.

9.  The callback from the print spooler to the system are scheduled via messages
    to avoid lock being held during the call. It was hard to guarantee that since a
    method holding a lock may be calling one that would like to release the lock
    at some point to make the callbacks.

10. Print spooler state is persisted only if something changes in a completed
    print job, i.e. not one that is being constructed due the print job config dialog.

11. Fixed a potential race in the RemotePrintSpooler where it was possible that
    a client that got a handle to the remote spooler calls into an unbound spooler.
    E.g: the client gets the remote interface with a lock held, now the client releases
    the lock to avoid IPC with a lock, during the IPC scheduling the spooler has
    notified the system that it is done and the system unbinds from it, now the
    client's IPC is made to a spooler that is disconnected.

Change-Id: Ie9c42255940a27ecaed21a4d326a663a4788ac9d
2013-07-30 17:15:11 -07:00
Jonathan Dixon
dad2c6e3fa Merge "Add some logging when the webview dev setting changes" 2013-07-30 23:29:57 +00:00
Amith Yamasani
364ed4dda4 PreferenceActivity Fragment security
Provides a way for PreferenceActivities to verify that they
aren't being launched with Fragments not meant to be attached to
them. Default implementation will fail verification for apps built
with KLP. This will not affect apps built for earlier targets.

Also, make sure that the class being instantiated is a Fragment and
not some random class.

Bug: 9901133

Change-Id: I564cd5168eabcadd7594ea8011e2081ebebfe063
2013-07-30 16:23:50 -07:00
Jonathan Dixon
cb64bb4b16 Add some logging when the webview dev setting changes
Bug: 9773865

This will not be visible in shipping config, so shouldn't be a major
source of log spam.

Change-Id: If09734b70e59aeab87c6dddee72212aa6748505f
2013-07-30 16:21:32 -07:00
Jean-Baptiste Queru
cb9accefb1 am 46aae98b: am f2d643cf: Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."
* commit '46aae98b41fe6e6b61aeddff3ad3f41bc4ceace3':
  Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
2013-07-30 15:34:26 -07:00
Jean-Baptiste Queru
46aae98b41 am f2d643cf: Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."
* commit 'f2d643cfc7405c1f771cacab365a0a5d9b547f36':
  Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
2013-07-30 15:32:19 -07:00
Jean-Baptiste Queru
f2d643cfc7 Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter." 2013-07-30 22:24:15 +00:00
Wink Saville
f2c89b9ed6 am 9516ed45: am cfc23ac6: Merge "Add support for MNC=00"
* commit '9516ed4598948eea5623c57e443bce08c1f48ab6':
  Add support for MNC=00
2013-07-30 12:28:05 -07:00
Wink Saville
9516ed4598 am cfc23ac6: Merge "Add support for MNC=00"
* commit 'cfc23ac688be9de1ecd2e659455ea1ebcceb63dc':
  Add support for MNC=00
2013-07-30 12:24:39 -07:00
Wink Saville
cfc23ac688 Merge "Add support for MNC=00" 2013-07-30 19:19:47 +00:00
Eino-Ville Talvala
2f1a2e423e Camera2 API: Rename package to android.hardware.camera2
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
2013-07-30 11:37:31 -07:00
Alan Viverette
39dd5a62ae Merge "Implement drag to open overflow menu, lift to select" 2013-07-30 18:04:43 +00:00
Alan Viverette
f45bdaf512 Merge "Don't show spinner popup if adapter is null" 2013-07-30 18:04:18 +00:00
Jean-Baptiste Queru
d248b0a4de am c2314cf5: am e700a36e: Merge "Update getCheckedItemPositions() documentation"
* commit 'c2314cf5f4efa2cc767e0069dcc2a67e12d7cd20':
  Update getCheckedItemPositions() documentation
2013-07-30 10:28:24 -07:00
Yorke Lee
6acfa5d567 Add URI and fields for new pinned position API in ContactsContract.
Change-Id: I947e49212750e0042a806d8f16817dc65597f45c
2013-07-30 09:52:36 -07:00
Jean-Baptiste Queru
c2314cf5f4 am e700a36e: Merge "Update getCheckedItemPositions() documentation"
* commit 'e700a36e4041a921f880a7c3c5ec6ce96c955a92':
  Update getCheckedItemPositions() documentation
2013-07-30 09:22:51 -07:00
Jean-Baptiste Queru
e700a36e40 Merge "Update getCheckedItemPositions() documentation" 2013-07-30 16:16:38 +00:00