Commit Graph

30868 Commits

Author SHA1 Message Date
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
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
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
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
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
Wink Saville
292a92e337 am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '7c00be48fcb1986db14915beef549e925b5670d2':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 17:10:32 -07:00
Wink Saville
f5f75cd8f2 Merge "Merge commit '81132d51' into fix-merge-conflict" into klp-dev 2013-08-09 00:09:25 +00:00
Wink Saville
f35f3201db Merge commit '81132d51' into fix-merge-conflict
* commit '81132d51':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.

Change-Id: I624732a5c29427bc22a156ccd46e6ff727af09c5
2013-08-08 16:51:46 -07:00
Jeff Brown
0933570357 Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev 2013-08-08 23:30:31 +00:00
destradaa
541ba71073 Merge "Add FlpHal layer to support Location Batching." into klp-dev 2013-08-08 22:57:25 +00:00
Wink Saville
9b7b445018 am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '02eab434ad9faa25291e63023b7e66698ca457a8':
  If in a mobile captive portal is detected enable fail fast.
2013-08-08 15:46:55 -07:00
Wink Saville
7c00be48fc am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '55adb390bb96175db9abee3ead349a98b4dc4262':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 15:46:52 -07:00
Wink Saville
81132d5197 am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
* commit 'b9b4321b756ac6e44650031ebfe0134508f60eaa':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
2013-08-08 15:46:49 -07:00
Jesse Hall
6a6bc216d1 Use new ISurfaceComposer::destroyDisplay method
Bug: 10191053
Change-Id: I3ecc6880db4a4c77c6db4e8b50faa9b4021d17c6
2013-08-08 15:44:15 -07:00
destradaa
1af4b0280a Add FlpHal layer to support Location Batching.
Change-Id: Ia3a57d869dfb3f067a1b95fa66d54f311ddcfdc3
2013-08-08 15:27:38 -07:00
Wink Saville
4d87d91dfe Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev 2013-08-08 22:07:27 +00:00
Wink Saville
35152f13b3 Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 2013-08-08 22:06:21 +00:00
Dianne Hackborn
8a0de58ece Get ProcessStats callable from other processes.
Also fix a bug where, when parceling the stats, we were
computing the final duration values too late.  We need to
do that before we write the long table.

Change-Id: Idb6c1ed95417448c56973fe5866bfb3570e525f4
2013-08-08 15:00:18 -07:00
Marco Nelissen
d6aa247155 am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit 'ca4553d33fe779dcdf2daad4590e4dbcfec7b62f':
  Guarantee that all db related files are deleted together.
2013-08-08 14:14:06 -07:00
Amith Yamasani
672d323bb4 Merge "Developer option to force RTL layout" into klp-dev 2013-08-08 20:45:47 +00:00
Amith Yamasani
d8415f4bf0 Developer option to force RTL layout
Make sure screen layout changes are taken into account in Configuration diffs.
Initialize the SystemProperty from Global settings on startup of
ActivityManagerService.

TextUtils checks the override flag to decide if the default layout direction
should be forced to RTL.

Bug: 10244047
Change-Id: I23a2583d790a355060d0d898ba44e5f7dc896b46
2013-08-08 13:42:02 -07:00
David Christie
3f7b652cd3 Add helper methods to set/query the location master switch.
Consolidates the logic of exactly what the master switch means
so that if we change in the future, we don't have to find
all the different parts of the code that use it (location
settings, location quick settings, power widget, etc).

Change-Id: Ib918143b82e16541f0873c4d9141adb11fb815fc
(cherry picked from commit db3720d42d)
2013-08-08 18:29:01 +00:00
Craig Mautner
bd6a6e6019 Use package CompatibilityInfo as default. DO NOT MERGE
Do not use CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO as default
if there is one for the package.

Partial fix for 10191318.

Change-Id: Ie218f0717398bb86e5c35066c8fe6a462b7d5273
2013-08-08 09:52:46 -07:00
Ben Murdoch
3650382175 Fix the build
Change-Id: If34523c4b25b3d60edc00b0f37b636bedfc756c2
2013-08-08 12:16:10 +01:00
Matt Casey
77ece7b192 Merge "Extend assist context to foreground services" 2013-08-08 09:33:08 +00:00
Martijn Coenen
81ba978410 Merge "NFC: Unify ApduServiceInfo for on/off host." 2013-08-08 04:25:55 +00:00
Ying Wang
610247fbb9 Merge "Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}." 2013-08-08 04:03:25 +00:00
Aravind Akella
f0f4a83112 Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}.
Change-Id: I55be472c554a5170f3db64b9cb49337a1f4691c0
2013-08-07 20:11:27 -07:00
Martijn Coenen
38d3bb7696 NFC: Unify ApduServiceInfo for on/off host.
Change-Id: I4f8bb441d7eb564da0486f3e8a1ac08dd18d0dc8
2013-08-07 20:03:03 -07:00
Satoshi Kataoka
b3c21ac7c6 Reduce the transaction fee of getEnabledInputMethodSubtypeList
Bug: 8467480
Change-Id: If18cce8fbe567df51f29adcdcedff3f743460b8b
2013-08-08 11:32:31 +09:00
Aravind Akella
52df1db3ce Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR." 2013-08-08 01:26:40 +00:00
Jason Monk
3bf09f77c2 Merge "Add PAC File support for proxy configuration" 2013-08-08 01:06:02 +00:00
Jason Monk
602b232a06 Add PAC File support for proxy configuration
PAC (Proxy auto-config) files contain a single javascript function,
FindProxyForURL(url, host).  It gets called to determine what proxy should be
used for a specific request.

This adds PAC support to the system.  The ProxyProperties has been modified
to hold the PAC file when one is present.  The Proxy method
setHttpProxySystemProperty has been modified to insert a PacProxySelector
as the default ProxySelector when it is required.  This new ProxySelector
makes calls to the ConnectivityService to parse the PAC file.

The ConnectivityService and the WifiConfigStore have been modified to support
saving the extra PAC file data.

The ConnectivityService now has a class attached (PacProxyNative) that
interfaces to the native calls for PAC files.  The parsing of the PAC file
is handled by libpac (which is being added to external/) which utilizes
libv8 to parse the javascript.

As a fallback to applications that don't use the java ProxySelector,  the proxy
is setup to point to a local proxy server that will handle the pac parsing.

bug:10182711
Change-Id: I5eb8df893c632fd3e1b732385cb7720ad646f401
2013-08-07 21:01:39 -04:00