43563 Commits

Author SHA1 Message Date
Brian Carlstrom
98c9491f4d am 39e885dc: Merge "Make MeasuredText.sCached field final"
* commit '39e885dc821fbfade43423fae712f82b1df08467':
  Make MeasuredText.sCached field final
2013-08-29 22:04:18 -07:00
Brian Carlstrom
39e885dc82 Merge "Make MeasuredText.sCached field final" 2013-08-30 05:01:55 +00:00
Svetoslav Ganov
99cc86f9e0 Addressing API councing suggestions for com.android.printservice
bug:10553001

Change-Id: Ic4f7882bd10fcce79c7afc65fdb2018cbadb19c2
2013-08-29 21:37:40 -07:00
Wink Saville
1681172544 am e8fcfd53: Merge "Add debug and remove SocketTimeoutException." into klp-dev
* commit 'e8fcfd53f60229f7f920992145bacb45a0a55675':
  Add debug and remove SocketTimeoutException.
2013-08-29 20:33:49 -07:00
Wink Saville
e8fcfd53f6 Merge "Add debug and remove SocketTimeoutException." into klp-dev 2013-08-30 03:30:51 +00:00
Fabrice Di Meglio
253fb7f6c3 Fix bug #10549094 KLP API Review: android.util.LayoutDirection
- use constant class instead of an interface
- make it final

Change-Id: I1bde76eb84cd92427e4e1fc2483cdecec429ae99
2013-08-29 18:13:28 -07:00
Wink Saville
9d4204d625 Add debug and remove SocketTimeoutException.
Bad merge from jb-mr2 to klp, the SocketTimeoutException
in isCaptivePortal should not be present. Also add debug
for bug 9972012. The SocketTimeoutException is a possible
cause of 9972012 but the logs from post #24 it was not
caused by a timeout, so this is not a fix.

Bug: 9972012
Change-Id: I290518832f8258d4682821815834f5621245b643
2013-08-29 16:42:44 -07:00
Mindy Pereira
e8ce8ba2b5 Add doubletap swipe to scalegesturedetector
Change-Id: I070b09ed7295e0c3e07c6dffcdaba20226f7c2a3
2013-08-29 16:33:02 -07:00
Robert Greenwalt
099845f1ae am 1c7674ef: Merge "Don\'t show roaming icon for specific operators" into klp-dev
* commit '1c7674ef55d283bf253973a6c6b738423f2e0a05':
  Don't show roaming icon for specific operators
2013-08-29 16:22:22 -07:00
Robert Greenwalt
1c7674ef55 Merge "Don't show roaming icon for specific operators" into klp-dev 2013-08-29 23:17:50 +00:00
Svetoslav Ganov
97c61ab7c0 am 86d2db97: Merge "Print spooler security and some new print service facing APIs." into klp-dev
* commit '86d2db9750657401deadea6766c94300c3bfc7cd':
  Print spooler security and some new print service facing APIs.
2013-08-29 16:02:22 -07:00
Svetoslav Ganov
86d2db9750 Merge "Print spooler security and some new print service facing APIs." into klp-dev 2013-08-29 22:59:08 +00:00
Adam Powell
91fa056a58 am 27439903: Merge "GridLayout changes for API council" into klp-dev
* commit '27439903438abfb24f5c36151386e723f2e57ebc':
  GridLayout changes for API council
2013-08-29 15:41:23 -07:00
Svetoslav Ganov
d26d4898fc Print spooler security and some new print service facing APIs.
1. Updated the security mode of the print spooler. Now the spooler
   is not signed with the system key, it is not a privileged app so if
   it gets compromised (PDF rendering is a potential attack vector)
   it cannot access dangerous permissions. Also only the system
   can bind to the spooler.

2. Added APIs for asking a print service to start and stop tracking
   a given printer. This is need for the case when the user selects
   the printer and the print service should do a best effort to keep
   the system updated for the current state of the printer.

3. Added APIs for putting a print job in a blocked state. A print
   service would report the print job as blocked if for some reason
   the printer cannot proceed, e.g. 99 pages are printed but there
   is no paper for the last one. The user has to add more paper
   and the print service can resume the job.

4. Changed the read/write APIs to use ParcelFileDescriptor instead
   of FileDescriptor since the latter does not have a clean API for
   detaching the wrapped Linux file descriptor when one wants to
   push it to native.

5. Added API for getting the size of the printed document so the
   print service can avoid handling big filed over cellular network
   or ask the user if needed.

6. Now the print services that are preinstalled on the system image
   are automatically enabled.

Change-Id: Ia06c311d3d21cabb9e1368f13928e11cd0030918
2013-08-29 15:39:44 -07:00
Adam Powell
2743990343 Merge "GridLayout changes for API council" into klp-dev 2013-08-29 22:38:24 +00:00
Kenny Root
b43b561884 am 9c83b968: am 85b666c3: Merge "Use core-tests-support instead of core-tests"
* commit '9c83b96859a67080101823c91ef7617c3b12354e':
  Use core-tests-support instead of core-tests
2013-08-29 15:24:57 -07:00
Wink Saville
d2f41b3dc6 am 35bd30b1: Merge "Merge commit \'270226b0\' into manualmerge" into klp-dev
* commit '35bd30b184b321754697b992aa5c581e204d530a':
  Add support for handling mobile provisioning networks.
2013-08-29 15:14:02 -07:00
Wink Saville
35bd30b184 Merge "Merge commit '270226b0' into manualmerge" into klp-dev 2013-08-29 22:10:52 +00:00
Adam Powell
465ea74234 GridLayout changes for API council
* Hide set/getPrinter methods. A change/addition like this should
  happen for all views if it happens, not just for one specific view.

* Follow Android style guidelines for fields.

Bug 10549037

Change-Id: I1823d7bbbd8bcc678c5be2358ca23a8dc6dbfd15
(cherry picked from commit 916159461bf17e13c245a709935a0d1133e0ed91)
2013-08-29 21:59:22 +00:00
Wink Saville
7788c61af5 Merge commit '270226b0' into manualmerge
* commit '270226b0':
  Add support for handling mobile provisioning networks.

Conflicts:
	core/java/android/net/CaptivePortalTracker.java
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	core/java/android/net/MobileDataStateTracker.java
	core/res/AndroidManifest.xml
	services/java/com/android/server/ConnectivityService.java

Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-29 14:57:08 -07:00
Kenny Root
9c83b96859 am 85b666c3: Merge "Use core-tests-support instead of core-tests"
* commit '85b666c3b61fd9a64731b144f00abe91e19cfe54':
  Use core-tests-support instead of core-tests
2013-08-29 14:52:34 -07:00
Amith Yamasani
b14f82be50 am 79a45c6f: Merge "Improve Intent disambig dialog behavior" into klp-dev
* commit '79a45c6f1837d5921e512213904c96660b1a80b1':
  Improve Intent disambig dialog behavior
2013-08-29 14:49:28 -07:00
Amith Yamasani
79a45c6f18 Merge "Improve Intent disambig dialog behavior" into klp-dev 2013-08-29 21:45:04 +00:00
Kenny Root
c2d6728350 Use core-tests-support instead of core-tests
The core-tests-support library is newly created. It doesn't have any
tests itself but some support for tests that need to use mocked classes
for testing. In this case, some tests are using TestKeyStore for SSL
testing in frameworks tests.

Change-Id: I70dc31c9fcddf256b515e2c16f581648bc8cf880
2013-08-29 14:28:41 -07:00
Martijn Coenen
1058145049 am a6dcf1a2: Merge "Add an API for querying HCE service selection mode." into klp-dev
* commit 'a6dcf1a2d634bd8c26b6a5744fc38874bcac6dd9':
  Add an API for querying HCE service selection mode.
2013-08-29 14:06:22 -07:00
Martijn Coenen
a6dcf1a2d6 Merge "Add an API for querying HCE service selection mode." into klp-dev 2013-08-29 21:01:16 +00:00
Martijn Coenen
c3f0044abe Add an API for querying HCE service selection mode.
This allows applications to differentiate between
the case where another app is the default, or the
case where the selection mode is "Ask every time".

Also, parse new requireDeviceUnlock attribute in
ApduServiceInfo.

Bug: 10262585
Change-Id: Icac508fe00054132574731532c05a1138edb24f5
2013-08-29 13:23:03 -07:00
Martijn Coenen
ff8ec5c56f am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
* commit 'c9c5d57e4e900573b8f8b65af4215cb45b48ce93':
  Add requireDeviceUnlock attribute for NFC HCE.
2013-08-29 12:57:33 -07:00
Martijn Coenen
c9c5d57e4e Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 2013-08-29 19:56:01 +00:00
Alan Viverette
69ce69b0e1 Update captioning APIs
CaptioningManager is now a first-class service in Context and can
have listeners added to it to monitor changes.

BUG: 10260603, 10461210
Change-Id: I2df5b2997537bb343d902b7ace3343ad483f3717
2013-08-29 12:23:48 -07:00
Sungmin Choi
f965bb1cf3 Don't show roaming icon for specific operators
bug:9896815
bug:10100304
bug:10097969
bug:10101601

Conflicts:
	core/res/res/values/config.xml

Change-Id: I6165f42b2a3d7f4bbd16c97f7a2b8760a688e2d4
2013-08-29 12:11:17 -07:00
Vineeta Srivastava
1aa646113d am 4fa9204d: Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev
* commit '4fa9204d0f28ba3823ec9f4c8a9912a416eee397':
  uicc : add config_stkNoAlphaUsrCnf to config.xml
2013-08-29 11:44:03 -07:00
Vineeta Srivastava
4fa9204d0f Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev 2013-08-29 18:41:27 +00:00
duho.ro
54ad798aef uicc : add config_stkNoAlphaUsrCnf to config.xml
Per 3GPP specification 102.223,
if the alpha identifier is not provided by the UICC,
the terminal MAY give information to the user.
set to false if we need to show user confirmation
when alpha identifier is not provided by the UICC.

Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f

Conflicts:
	core/res/res/values/config.xml
2013-08-29 11:35:09 -07:00
Isaac Katzenelson
87fe4c28d3 am 1d04b640: Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
* commit '1d04b640ec97e31b8d4fbef134a5b7f083eac9b7':
  Add ACTION_SHOW_ALARMS to Clock API
2013-08-29 10:57:47 -07:00
Isaac Katzenelson
1d04b640ec Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev 2013-08-29 17:52:32 +00:00
Sam Blitzstein
2f7acd19be Add ACTION_SHOW_ALARMS to Clock API
Add in an action to jump to the alarms page of a clock app.
Helpful for quick settings, for example.

Bug: 10506871
Change-Id: Ia18708c7962543911864dfaefa17d5356eed1b45
2013-08-29 10:49:57 -07:00
Wink Saville
270226b0dd am 8cb2f42e: am 948282b0: Add support for handling mobile provisioning networks.
* commit '8cb2f42eea2ef3b249528aa7913fc7a6dfc6b741':
  Add support for handling mobile provisioning networks.
2013-08-29 10:26:06 -07:00
Leon Scroggins III
af1725190f am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
* commit '4b2993123bf9a1c56d0a16b032612834dd418520':
  Replace stream wrap-function w/ more specific ones
2013-08-29 10:22:48 -07:00
Leon Scroggins III
4b2993123b Merge "Replace stream wrap-function w/ more specific ones" into klp-dev 2013-08-29 17:12:01 +00:00
Wink Saville
948282b0e6 Add support for handling mobile provisioning networks.
When a sim is new or it has expired it needs to be provisioned
with the carrier. Basically provisioning is associating a sim with
a user account. When a sim isn't provisioned then operators will
restrict access to the network and only allow certain addresses
or services to be used.

This set of changes allows two types of provisioning networks to be
recognized. The first is a network that causes all DNS lookups to be
redirected to a different address than was intended. This is exemplified
by how T-Mobile works.

The second technique uses a special apn for provisioning. An example is
AT&T where lwaactivate is the provisioning apn and broadband is the
normal apn. We first try broadband and if we are unable to connect we
try lwaactivate. When we see the activate we identify it as special and
the ApnContext.isProvisioningApn will return true.

In the future our plan is to create a new network type that can be added
to the apn list, but for now it identified by name.

Here is a list of significant changes:

 - CaptivePortalTracker now only test WiFi networks instead of all networks
 - checkMobileProvisioning checks for provisioning networks and doesn't
   try to ping.
 - IConnectivityManager.aidl changes:
   * getProvisioningOrActiveNetworkInfo was added to and used by Manage
     mobile plan in WirelessSettings so even when there is no active
     network it will still allow provisioning. Otherwise it would report
     no internet connection.
   * setSignInErrorNotificationVisible is used by both
     CaptiviePortalTracker and checkMobileProvisioning so they use the
     same code for the notifications.
   * checkMobileProvisioning was simplified to have only a timeout as
     returning the result is now harder as we abort simultaneous call
     otherwise we'd could get into loops because we now check every time
     we connect to mobile.
 - Enhanced MDST to handle the provisioning network.
 - Added CONNECTED_TO_PROVISIONING_NETWORK to NetworkInfo to make a new
   state so we don't announce to the world we're connected.
 - TelephonyIntents.ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN
   is sent by the low level data connection code to notify Connectivity
   Service that a provisioning apn has connected. This allows CS to
   handle the connection differently than a normal connection.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-29 08:55:16 -07:00
Brian Carlstrom
d4f4526cb4 Make MeasuredText.sCached field final
Change-Id: Id3be64c48be1bcf55ac1a4b00b76a40861bf2f61
2013-08-29 01:32:13 -07:00
Jeff Hao
7be3a138d5 Add frameworks support for sample profiling from traceview gui.
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)

Change-Id: I3553bafe24ac8deb4fa3f9a4d78939c3848b3850
2013-08-28 22:13:17 -07:00
Jeff Sharkey
6607275b3a am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev
* commit '9fd81a9008d5c8dd33272b6a451d89fa2fa1841e':
  Stronger DocumentsProvider contract.
2013-08-28 21:32:08 -07:00
Jeff Sharkey
9fd81a9008 Merge "Stronger DocumentsProvider contract." into klp-dev 2013-08-29 04:27:02 +00:00
Jeff Sharkey
aeb16e2435 Stronger DocumentsProvider contract.
Using a contract class requires that a provider implement it exactly
with little help. This change introduces a DocumentsProvider abstract
class that provides a client-side implementation of the contract that
greatly reduces developer burden, and improves correctness.

This also moves to first-class DocumentRoot objects, and moves calls
with complex side effects to be ContentProvider.call() invocations,
offering more granular permission control over Uri operations that
shouldn't be available through Uri grants.

This new design also relaxes the requirement that root information be
burned into every Uri.  Migrate ExternalDocumentsProvider and
DocumentsUI to adopt new API.

Bug: 10497206
Change-Id: I6f2b3f519bfd62a9d693223ea5628a971ce2e743
2013-08-28 20:49:42 -07:00
Jonathan Dixon
9f9fbc9605 Fix for 10530176 - CookieSyncManager must be created by WebView c'tor
WebViewClassic created the CookieSyncManager instane as a side effect of
starting up its internal WebCoreThread. As this forms part of th API
contract (app doesn't need to call CookieSyncManager.createInstance if
it already made a WebView instance) promote this logic up to the API
layer.

Change-Id: I0e92d97be987dfef90162ad379c79b066aae34e0
2013-08-28 20:29:39 -07:00
Baligh Uddin
9c35975546 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 03:04:01 +00:00
Alan Viverette
de16f5f605 am b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
* commit 'b432ca60c6c7af42989db28594137f6fe1e888b4':
  Fix documentation regarding defStyle in View constructor
2013-08-28 18:17:31 -07:00
Alan Viverette
b432ca60c6 Merge "Fix documentation regarding defStyle in View constructor" into klp-dev 2013-08-29 01:15:48 +00:00