Commit Graph

33432 Commits

Author SHA1 Message Date
Jeff Sharkey
fd06f853fe am 1d685ec0: am 6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev
* commit '1d685ec0610c2047d28e59eed19ceac744146e25':
  APIs for multiple external storage devices.
2013-08-11 18:09:23 -07:00
Jeff Sharkey
6e14b22cfe Merge "APIs for multiple external storage devices." into klp-dev 2013-08-12 00:13:35 +00:00
Jeff Sharkey
1abdb71230 APIs for multiple external storage devices.
Provide developer APIs to discover application-specific paths on
secondary external storage devices.  Covers files, cache, and OBB
directories.  Apps will not have write access outside their package-
specific directories on secondary devices, so only primary storage is
exposed through Environment.

Creation of .nomedia files will be handled by FUSE daemon in future
change.

Change-Id: Ifcce6201a686d80269d7285adb597c008cf8fa7c
2013-08-11 17:07:44 -07:00
Svetoslav Ganov
f7513b594b am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev
* commit 'e1c2dfeebd5f8befd69ab6ec4801436a325071e5':
  Refinement of the print service APIs.
2013-08-11 14:50:08 -07:00
Svetoslav Ganov
c7c4d6dd4d Merge "Refinement of the print service APIs." into klp-dev 2013-08-11 21:42:54 +00:00
Svetoslav Ganov
798bed6cc7 Refinement of the print service APIs.
1. Factored out the printer discovery APIs of a print service in a
   dedicated session object that is created by the print service on
   demand. This ensures that added/removed/updated printers from
   one session do not interfere with another session.

2. Updated the app facing APIs to pass in a document info along
   with a printed file. Also exposed the print file adapter so
   apps that create a temporary file for printing can intercept
   when it is read by the system so the file can be deleted.

3. Updated the print service documentation.

Change-Id: I3473d586c26d8bda1cf7e2bdacb441aa9df982ed
2013-08-11 14:40:05 -07:00
Wink Saville
c05b5cf71b Fix build.
Change-Id: If82537ec6156263ea36bbfc0be0c58112c34329f
2013-08-10 12:56:07 -07:00
Wink Saville
18dfb63044 am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null.
* commit 'a9f2faa9a7e7539b71b342d1923cfbc14c7e6bbd':
  PROXY_SERVICE may be missing and its reference null.
2013-08-10 11:38:48 -07:00
Wink Saville
a48ad8bd85 PROXY_SERVICE may be missing and its reference null.
Protect ourselves from when PROXY_SERVICE is missing
and mProxyService is null.

Bug: 10267814
Change-Id: Ia329376218e246cdde3d70b578c18466d48a6383
2013-08-10 11:22:31 -07:00
Zhihai Xu
6f117ea8c2 am 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '71716cc5202550900271b83e8993a111f99dd7fd':
  Bluetooth MAP profile - sms and mms support initial check-in
2013-08-09 18:56:31 -07:00
Zhihai Xu
97aaa8f01b Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev 2013-08-10 01:47:07 +00:00
Romain Guy
0cd04a0d83 am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev
* commit '06c2bad60079099b2496f2939655b72ffc649b29':
  Prevent AsyncTask from creating too many threads Bug #10228005
2013-08-09 17:13:55 -07:00
Romain Guy
96aadf837c Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev 2013-08-10 00:07:22 +00:00
Dianne Hackborn
7ab53c3356 am d021b6b1: am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev
* commit 'd021b6b14a801cce1b575d536323af65587f2fbe':
  More stuff I need for the proc stats UI.
2013-08-09 16:45:26 -07:00
Dianne Hackborn
b0037316c4 Merge "More stuff I need for the proc stats UI." into klp-dev 2013-08-09 23:19:07 +00:00
Dianne Hackborn
69cb00b8dd More stuff I need for the proc stats UI.
Change-Id: I5f05b79bc4d5766a80f2db9d20ba8078b60c1b00
2013-08-09 16:16:56 -07:00
Romain Guy
719c44e03b Prevent AsyncTask from creating too many threads
Bug #10228005

From the ThreadPoolExecutor documentation:

  - If fewer than corePoolSize threads are running, the Executor
    always prefers adding a new thread rather than queuing.
  - If corePoolSize or more threads are running, the Executor
    always prefers queuing a request rather than adding a new thread.
  - If a request cannot be queued, a new thread is created unless
    this would exceed maximumPoolSize, in which case, the task will
    be rejected.

Before this change AsyncTask could create up to 128 threads because
of the limited queue of 10 items (the capacity of a blocking queue
is fixed.)

This change increases the size of the queue to 128 items and reduces
the maximum number of threads to the number of CPU cores * 2 + 1.
Apps can still submit the same number of tasks.

Change-Id: I015d77b53b6a9fda39c618830b34d45a10de5571
2013-08-09 16:15:18 -07:00
Matthew Williams
98ecf58e3e Merge "Fix for scheduling conflicts, address fred's comments" 2013-08-09 23:04:50 +00:00
Chet Haase
1802d4bfd8 am 17198172: am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev
* commit '1719817211743cabf53e06761ad5540518544273':
  Reduce amount of invalidation when old-style animations are running
2013-08-09 15:58:51 -07:00
keunyoung
b62368a515 am c9bf4052: am f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev
* commit 'c9bf4052c71d7f473c781363bc7ff757a427c0e3':
  add local focus mode and input event injection API to Window
2013-08-09 15:54:05 -07:00
Martijn Coenen
bc66a3736f am b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev
* commit 'b59dbedceddc18e94fa75fe87523cf026e4e79b6':
  NFC: always upper-case parsed AIDs.
2013-08-09 15:53:54 -07:00
Alan Viverette
30a16d02e5 am bd430b25: am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev
* commit 'bd430b250880f8376bb4c59f62c627d90ae14324':
  Fix padding adjustment for scrollbars in View, FastScroller
2013-08-09 15:53:51 -07:00
Geoffrey Borggaard
310cf7a86e am d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev
* commit 'd1715fdaaf2a11484e6dc60710f13e2495cf6bbb':
  Add a name to the DeviceOwner
2013-08-09 15:53:43 -07:00
Fabrice Di Meglio
c9ff18ba46 am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev
* commit 'e4e68219ded0920f0e92ecce6e1cf220603942dc':
  Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP
2013-08-09 15:53:40 -07:00
Dianne Hackborn
9e84538c96 am 003b944d: am d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev
* commit '003b944d495bd8a54b61fa565a268dd2c9c21ba1':
  Add method for adding two ProcessStats objects together.
2013-08-09 15:53:36 -07:00
Chet Haase
2b2d313e86 Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev 2013-08-09 22:50:35 +00:00
Chet Haase
2632b5d0d2 Reduce amount of invalidation when old-style animations are running
Previously, old animations (view.animation.*) would cause invalidations on
both the area of the child view and then the entire parent area. There's no
reason for the second invalidation; only the child area need be redrawn.

Issue #10229470 Old animation code in View.draw() may be invalidating too much

Change-Id: I4d0d16321e20b2f34dc579eacf5d3841aed33d6d
2013-08-09 15:05:14 -07:00
Matthew Xie
fe3807a5b2 Bluetooth MAP profile - sms and mms support initial check-in
bug:10116530

Change-Id: I57d022005bcff5bc3e56438a81ac92566f957744
2013-08-09 15:01:07 -07:00
keunyoung
f6c7a5fd66 Merge "add local focus mode and input event injection API to Window" into klp-dev 2013-08-09 21:51:30 +00:00
Martijn Coenen
4bcc8ee682 Merge "NFC: always upper-case parsed AIDs." into klp-dev 2013-08-09 20:50:52 +00:00
Alan Viverette
be11c364e7 Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev 2013-08-09 20:46:02 +00:00
Martijn Coenen
62c196abd2 NFC: always upper-case parsed AIDs.
Also added activity intent action for Tap&Pay settings.

Change-Id: I5648e1ded3b79a3363899d1cab8aec55842b3e22
2013-08-09 13:43:34 -07:00
Matthew Williams
96ca46cf87 Fix for scheduling conflicts, address fred's comments
The last set of comments asked for a renaming. Rather than
confuse the issue now, this patch set focuses on the internals
and API changes can come later.
Renamed AnonymousSyncAdapter -> SyncServiceAdapter

Change-Id: I596ea2f7367b83b357b2f4b56e069448d5591b2a
2013-08-09 13:37:04 -07:00
Geoffrey Borggaard
9b59e5aa9c Merge "Add a name to the DeviceOwner" into klp-dev 2013-08-09 20:27:26 +00:00
Geoffrey Borggaard
334c7e32d4 Add a name to the DeviceOwner
We will need to display the name of the device owner (the human
readable name of the institution) to the user.
"This device is managed by google.com"

Change-Id: Ic33b6530c19cb14a118245692697205de3911a58
2013-08-09 15:56:52 -04:00
Fabrice Di Meglio
88dced2936 Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev 2013-08-09 19:54:19 +00:00
Dianne Hackborn
60444fd594 Add method for adding two ProcessStats objects together.
Also move file reading code over to ProcessStats.

Change-Id: Ib42272b90a408a494044965e98beed16c0b3f8a5
2013-08-09 12:08:17 -07:00
Alan Viverette
26bb253b40 Fix padding adjustment for scrollbars in View, FastScroller
BUG: 10224791,10248282
Change-Id: Ia89d2cbea163b7cad567ea37161552c1cfd66045
2013-08-09 10:40:50 -07:00
Jeff Sharkey
e7da9c3c4a am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev
* commit '87a61b838c5cc411853317663beaa46539fd56ef':
  Allow packages.list access with new GID.
2013-08-09 06:06:58 -07:00
Wink Saville
f90de3a2b5 am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '8418a309a3e228538a2cf921f386326a9afe394b':
  If in a mobile captive portal is detected enable fail fast.
2013-08-09 06:06:42 -07:00
Wink Saville
f5e5ae65aa am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '8eec0cbe01064156c52a87592796a4352f31a451':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-09 06:06:39 -07:00
Wink Saville
9a353be5d4 am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev
* commit '94e9e8f16a7a72d1491694b44006b96212d8076e':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
2013-08-09 06:06:36 -07:00
Jeff Brown
c3a0e6acaa am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev
* commit '1c7799e2f35b707c5f5d6544a6d94cd4892891da':
  Use new ISurfaceComposer::destroyDisplay method
2013-08-09 06:06:33 -07:00
Martin Kosiba
24ee60be73 Merge "Add super_onDrawVerticalScrollBar to WebView.PrivateAccess." 2013-08-09 12:38:43 +00:00
Martin Kosiba
c95fbbf2ed Add super_onDrawVerticalScrollBar to WebView.PrivateAccess.
This exposes the super_onDrawVerticalScrollBar method which will
be called by the WebViewChromium implementation.

Change-Id: I210dbab01c8b8d1eeff316a23c5d011e2e6c2a74
2013-08-09 13:36:35 +01:00
keunyoung
30f420fd6a add local focus mode and input event injection API to Window
- This enables keyboard navigation for window without focus.
 - FLAG_LOCAL_FOCUS_MODE puts window into local focus mode.
 - Application needs to put window in local focus mode, control focus, and
   inject events to make dpad navigation work.
 - Window in local focus mode does not interact with window manager or ime
   regarding focus related events.
 - Also renamed ViewRootImpl.dispatchKey to dispatchInputEvent to allow both key and touch events injection.

Change-Id: I8e8561f29e0dade3797fb7ae3ee7690e6b7f8895
2013-08-08 19:45:21 -07:00
Fabrice Di Meglio
4155e2e175 Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP
This issue has been actually revealed by a fix for bug #7034321 (Need Drawable RTL support)
where I identified an issue with Drawables resolution in TextView (was missing a call to
resetResolvedDrawables() and resolveDrawables()).

- add missing resetResolvedDrawables() and resolveDrawables() in TextView.setRelativeDrawablesIfNeeded()
- fix View.resolveDrawables():

this was a bit trycky as View.resolveDrawables() was wrongly supposing that the layout direction was
resolved and it could access View.getLayoutDirection() and could position the PFLAG2_DRAWABLE_RESOLVED
bit.

Dont forget that resolution of RTL properties (layoutDirection, Drawables ...) is happening in
View.measure() but in our case (TexView constructor) we still need to resolve the Drawables.

So now, be sure that we cannot resolve the Drawable if layout direction has not being resolved and the
raw layout direction is LAYOUT_DIRECTION_INHERIT.

But we can also "cheat" if the raw layout direction is LAYOUT_DIRECTION_LTR or LAYOUT_DIRECTION_RTL
or LAYOUT_DIRECTION_LOCALE as its resolution will give the same value :-)

Change-Id: I7a242d918697e1e1c2febf229e8edf1866b855be
2013-08-08 18:22:08 -07:00
Jeff Sharkey
8a65f5b871 Merge "Allow packages.list access with new GID." into klp-dev 2013-08-09 00:44:55 +00:00
Jeff Sharkey
184a0100ab Allow packages.list access with new GID.
The FUSE daemon is using packages.list to map from package name to
appId after it drops permissions, so create a new "package_info" GID
to grant read access.

Also switches FileUtils to use Libcore.os.

Change-Id: I9451ca4e90e8a985526805c6df0888a244a1db36
2013-08-08 17:38:13 -07:00
Wink Saville
89d16f7597 am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '9b7b4450185e723dc7021f7e8bae4a12d4dd5606':
  If in a mobile captive portal is detected enable fail fast.
2013-08-08 17:10:34 -07:00