110969 Commits

Author SHA1 Message Date
quddusc
93c84e8242 am ee9d38ff: am 40765a4a: am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit 'ee9d38ff24358774d194108128e99f09d08ddf8e':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
2013-08-29 15:16:01 -07:00
Wink Saville
35bd30b184 Merge "Merge commit '270226b0' into manualmerge" into klp-dev 2013-08-29 22:10:52 +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
Amith Yamasani
79a45c6f18 Merge "Improve Intent disambig dialog behavior" into klp-dev 2013-08-29 21:45:04 +00:00
Jason Sams
6b11598048 Merge "Unhide USAGE_IO_INPUT functions" into klp-dev 2013-08-29 21:24:28 +00:00
Craig Mautner
a78d9a24d9 Merge "Reset activity's "return to home" flag on relaunch" into klp-dev 2013-08-29 21:14:31 +00: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
Jason Sams
42ef238208 Unhide USAGE_IO_INPUT functions
Change-Id: I9c1a7e5d65adee133b99b9a94729ab0b3d5a097f
2013-08-29 13:30:59 -07: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
c9c5d57e4e Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 2013-08-29 19:56:01 +00:00
Craig Mautner
e12a4a6810 Reset activity's "return to home" flag on relaunch
When relaunching an activity re-evaluate the flag that determines
whether to return to the next activity on the stack or to the home
activity upon return.

Fixes bug 10545580.

Change-Id: I5868ce1b494afffcc5afc22abe3b65aa339827bb
2013-08-29 12:24:56 -07:00
Igor Murashkin
c7d515aa21 Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev 2013-08-29 18:59:10 +00:00
quddusc
ee9d38ff24 am 40765a4a: am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '40765a4a5300914e8c7ce7ed6397cec7ab8d78a1':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
2013-08-29 11:57:52 -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
quddusc
40765a4a53 am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '2ef3952d8e62b71baca176b3e17315a37facd34a':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
2013-08-29 11:12:44 -07:00
John Spurlock
e87bc32e6d Merge "More SystemUI asset updates." into klp-dev 2013-08-29 18:03:58 +00:00
John Spurlock
fc3c06ef21 More SystemUI asset updates.
White close handles, a few missed xx items.

Bug:10502089
Change-Id: I788f3698249e72c3df3d039c68b438998db1b978
2013-08-29 13:56:31 -04:00
Geoffrey Borggaard
06b9bb0c81 Merge "UserManagerService upgrades users on first restart." into klp-dev 2013-08-29 17:54:37 +00:00
quddusc
2ef3952d8e cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Change-Id: Idce540108d048d76fc2c4bc37ecf2118b82588c5
2013-08-29 10:52:49 -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
Wink Saville
8cb2f42eea am 948282b0: Add support for handling mobile provisioning networks.
* commit '948282b0e6cf5310f09db97a4ae939db7c1cef72':
  Add support for handling mobile provisioning networks.
2013-08-29 10:22:55 -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
Geoffrey Borggaard
15b8b2c068 UserManagerService upgrades users on first restart.
This causes all restriction pins to be reset.

Bug: 10535070
Change-Id: Ia2abf904505514d7e555b420c2b032a0094e0643
2013-08-29 13:07:49 -04: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
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
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
Baligh Uddin
166853e6c9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 03:06:07 +00:00
Baligh Uddin
5c77627077 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 03:04:13 +00:00
Baligh Uddin
9c35975546 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 03:04:01 +00:00
Baligh Uddin
612db0a007 Import translations. DO NOT MERGE
Change-Id: I665172800a06d780b92a5db2ab549980c87e8524
Auto-generated-cl: translation import
2013-08-28 18:35:58 -07:00
Alan Viverette
b432ca60c6 Merge "Fix documentation regarding defStyle in View constructor" into klp-dev 2013-08-29 01:15:48 +00:00
Baligh Uddin
62ee6fab65 Import translations. DO NOT MERGE
Change-Id: Ic6b1048f4afaa520fea602ec4367de5e192186bd
Auto-generated-cl: translation import
2013-08-28 18:05:47 -07:00
John Spurlock
ab8fe69296 Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev 2013-08-29 01:00:03 +00:00
Robert Greenwalt
9fe5b28dc2 Merge "More elaborate logs to debug missing APs" into klp-dev 2013-08-29 00:51:35 +00:00
Baligh Uddin
ad155cdacc Import translations. DO NOT MERGE
Change-Id: I22efa95394f7b572df2b43138fee45bd7eaf4229
Auto-generated-cl: translation import
2013-08-28 17:36:17 -07:00
Alan Viverette
fb410d219f Fix documentation regarding defStyle in View constructor
BUG: 8912583
Change-Id: Ib8b1f8baa4ee98aae0e66edc547ab014b2401415
2013-08-28 16:57:42 -07:00
Sandeep Siddhartha
720959cc7f Merge "Start using the Hotword recognition APIs" into klp-dev 2013-08-28 23:55:57 +00:00
Chet Haase
52485b0b7e Merge "Better transition interruption and TextChange fixes" into klp-dev 2013-08-28 23:55:10 +00:00
Chet Haase
af78bdd615 Better transition interruption and TextChange fixes
Previously, the TextChange transition didn't handle interruption/
cancellation at all, which made it problematic to use in any real
situation where a transition might get interrupted mid-animation.
Also, the way that it side-effected the text of TextView objects caused
errors in the UI when the transition was interrupted, because it would
not clean up after itself properly as new transitions queried the
current state of the UI.

Also, the prior cancellation logic for all transitions was not quite
correct; we were pausing transitions but resuming the animations, making it
tricky to write transitions that would restore state correctly.

Change-Id: I5a9f3c915e9834ec59ce1e1c3c96a88d11e4aa1b
2013-08-28 16:50:13 -07:00
Isaac Katzenelson
18f590a9b7 Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev 2013-08-28 23:49:41 +00:00
Sandeep Siddhartha
42c3e02c52 Start using the Hotword recognition APIs
- Gets rid of all assumptions about the hotword service
- Fixes bug where the hotword detection would keep running accidentally
  even when the screen got turned off

Change-Id: Ie86c1a4f4343bdf7e61f7c21114fd3b287bd5401
2013-08-28 23:40:32 +00:00
Sandeep Siddhartha
bd31a483d3 Merge "Tweak the HotwordRecognizer API" into klp-dev 2013-08-28 23:39:00 +00:00
Sandeep Siddhartha
823393477b Tweak the HotwordRecognizer API
- Make it more intuitive by enforcing callers to set a listener while
  starting recognition
- Fix TODO to resolve the ComponentName if none is provided
- Unbind from the Hotword service if stopRecognition is called
- Get rid of the callback in onStopHotwordRecognition

Change-Id: I8edad0ef0f3671283aeb51eaed1d3b8dab01baa0
2013-08-28 16:27:36 -07:00
Mindy Pereira
dd9b079cdf Merge "Fix case when user touches the very edge of a view" into klp-dev 2013-08-28 23:08:53 +00:00
Mindy Pereira
0d3da1232b Fix case when user touches the very edge of a view
This now counts touches at the exact top edge of the view as valid

Change-Id: I9e81a7001632c38d567dde40954e079e7145fa36
2013-08-28 15:00:14 -07:00
Vinit Deshapnde
48c4747106 More elaborate logs to debug missing APs
Bug: 10375978

Change-Id: Ic9bb8f3a7a0684143e4e77f8da0d2c833293c94a
2013-08-28 13:13:40 -07:00