7488 Commits

Author SHA1 Message Date
Baligh Uddin
778aaf7adc Merge "Import translations. DO NOT MERGE" 2013-09-04 04:43:33 +00:00
Geoffrey Borggaard
ae1010646d am 5ea93036: am 4cf435a0: Merge "UX improvements to the restrictions PIN" into klp-dev
* commit '5ea9303651ae9c1412eef42b59fb427f177f842e':
  UX improvements to the restrictions PIN
2013-09-03 17:45:21 -07:00
Geoffrey Borggaard
5ea9303651 am 4cf435a0: Merge "UX improvements to the restrictions PIN" into klp-dev
* commit '4cf435a038be4731c06602785f7dab8bee0b55af':
  UX improvements to the restrictions PIN
2013-09-03 17:43:47 -07:00
Geoffrey Borggaard
4cf435a038 Merge "UX improvements to the restrictions PIN" into klp-dev 2013-09-04 00:41:26 +00:00
Matthew Xie
b90908eb9e am 171f8be4: am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev
* commit '171f8be41215c2d9662c2da29329e9c4040fc3e0':
  Block ble adv api based on resource config
2013-09-03 15:43:24 -07:00
Matthew Xie
171f8be412 am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev
* commit '02a25a97a24e06768159ddc2b680c253a2ce71c7':
  Block ble adv api based on resource config
2013-09-03 15:40:14 -07:00
Matthew Xie
02a25a97a2 Merge "Block ble adv api based on resource config" into klp-dev 2013-09-03 22:36:09 +00:00
Tom O'Neill
bac809db91 am 24bd1740: am d0e2a2e7: Merge "Improve constant names for settings injection API" into klp-dev
* commit '24bd1740df0bec25c4a9262e8c578bfb765c3ef6':
  Improve constant names for settings injection API
2013-09-03 13:30:59 -07:00
Tom O'Neill
24bd1740df am d0e2a2e7: Merge "Improve constant names for settings injection API" into klp-dev
* commit 'd0e2a2e7a9a6c247f501a5044d1c19cd82c6129d':
  Improve constant names for settings injection API
2013-09-03 13:28:24 -07:00
Tom O'Neill
d0e2a2e7a9 Merge "Improve constant names for settings injection API" into klp-dev 2013-09-03 20:25:56 +00:00
Martijn Coenen
dca11c9913 am e22cb840: am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev
* commit 'e22cb840d5691c073d24cfa56c0df7f706fa4405':
  Add drawable for Apdu Services, fix build.
2013-09-03 12:35:13 -07:00
Martijn Coenen
e22cb840d5 am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev
* commit 'b143c66987d596d9101a5b12fcd7572d4a6026fb':
  Add drawable for Apdu Services, fix build.
2013-09-03 12:32:07 -07:00
Martijn Coenen
c85fb576b8 Add drawable for Apdu Services, fix build.
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
2013-09-03 12:24:18 -07:00
Santos Cordon
92774a9f97 am 8bd2eb31: am 90a5df1e: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev
* commit '8bd2eb314bf923f556fda0229a1ef44392c4ec00':
  Revert "Add permissions for the InCallUI Split."
2013-09-03 10:53:28 -07:00
Santos Cordon
8bd2eb314b am 90a5df1e: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev
* commit '90a5df1ee8c89ca17df93d9ecf95652b2ae619f4':
  Revert "Add permissions for the InCallUI Split."
2013-09-03 10:49:15 -07:00
Santos Cordon
90a5df1ee8 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-03 17:43:29 +00:00
Santos Cordon
b6c46d2381 Revert "Add permissions for the InCallUI Split."
This reverts commit bf84eb5ed579d13b74c97b995299ca61cafedea6.

Change-Id: I40e311174898a741f5053501290833420355ad03
2013-09-03 17:42:04 +00:00
Baligh Uddin
369606b20c Import translations. DO NOT MERGE
Change-Id: Ie85b893759882da0ce3161a377bd9768c7901ab3
Auto-generated-cl: translation import
2013-09-03 09:57:33 -07:00
Santos Cordon
42d1cd25be am 8fab063a: am 7f60dc57: Merge "Add permissions for the InCallUI Split." into klp-dev
* commit '8fab063abcfef648bef9232dad62c8b8cea251d5':
  Add permissions for the InCallUI Split.
2013-09-03 09:50:09 -07:00
Santos Cordon
8fab063abc am 7f60dc57: Merge "Add permissions for the InCallUI Split." into klp-dev
* commit '7f60dc57780281030f26a2109a64d0260e976af7':
  Add permissions for the InCallUI Split.
2013-09-03 09:47:12 -07:00
Santos Cordon
7f60dc5778 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-03 16:45:24 +00:00
Santos Cordon
bf84eb5ed5 Add permissions for the InCallUI Split.
Change-Id: Ic759d14acefcea746e0d8e86c0f006d4bc462386
2013-09-03 08:19:17 -07:00
satok
31d3f51f48 am 35826992: am f2724463: Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev
* commit '3582699241554f28e9efd22b551837de22b6dd70':
  Improve the API document for supportsSwitchingToNextInputMethod
2013-09-01 22:55:35 -07:00
satok
3582699241 am f2724463: Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev
* commit 'f272446372b865e315240bce50853769d77fa939':
  Improve the API document for supportsSwitchingToNextInputMethod
2013-09-01 22:52:59 -07:00
satok
f272446372 Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev 2013-09-02 05:49:43 +00:00
Geoffrey Borggaard
8135f3a9d3 UX improvements to the restrictions PIN
As per Rachel.  Remove the title, change the hint text.
Don't make the dialog disappear after failed attempts.
Bug: 10542734

Change-Id: I1cae3d74bd4da06364626d63faf945f629cf6537
2013-08-30 23:02:10 +00:00
Tom O'Neill
546113d4c2 Improve constant names for settings injection API
- Add timing for getStatus() call to encourage implementors to be fast

- Affects b/10461474

Change-Id: I503cbae5cf27008c587a39ab4e60d8e09daedecc
2013-08-30 10:09:39 -07:00
Robert Greenwalt
8e606a400e am 099845f1: am 1c7674ef: Merge "Don\'t show roaming icon for specific operators" into klp-dev
* commit '099845f1ae14c80a16b166ea72ed6fa72ee39879':
  Don't show roaming icon for specific operators
2013-08-29 16:25:23 -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
4b905b6195 am 97c61ab7: am 86d2db97: Merge "Print spooler security and some new print service facing APIs." into klp-dev
* commit '97c61ab7c02c24c485acf5775310a304730dfeea':
  Print spooler security and some new print service facing APIs.
2013-08-29 16:05:09 -07: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
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
Wink Saville
ae1fda5aa3 am d2f41b3d: am 35bd30b1: Merge "Merge commit \'270226b0\' into manualmerge" into klp-dev
* commit 'd2f41b3dc692e2c9a0c2f60bdf0730d9b52b6df3':
  Add support for handling mobile provisioning networks.
2013-08-29 15:16:27 -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
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
4014239337 am b14f82be: am 79a45c6f: Merge "Improve Intent disambig dialog behavior" into klp-dev
* commit 'b14f82be509da4698c6aeb4bb3d1e483f85375af':
  Improve Intent disambig dialog behavior
2013-08-29 14:56:03 -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
Martijn Coenen
f42c0fcb90 am ff8ec5c5: am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
* commit 'ff8ec5c56fd81f977c46a39badfd7de3bbfebfdd':
  Add requireDeviceUnlock attribute for NFC HCE.
2013-08-29 12:59:43 -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
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
beaa1c53c9 am 1aa64611: am 4fa9204d: Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev
* commit '1aa646113daf7c85d6b443d5ec47bea024adaa7a':
  uicc : add config_stkNoAlphaUsrCnf to config.xml
2013-08-29 11:46:10 -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
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
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
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