111167 Commits

Author SHA1 Message Date
Jesse Hall
655cff1799 Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2013-08-30 21:09:12 +00:00
Ed Tam
468c60b334 am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
  Telephony: SMS over IMS, DO NOT MERGE
2013-08-30 14:06:47 -07:00
Ed Tam
00e4c6721b am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit 'f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
  Telephony: SMS over IMS, DO NOT MERGE
2013-08-30 14:04:45 -07:00
Victoria Lease
79d8f06ae7 add Noto Sans Khmer and Lao
Bug: 7672029
Change-Id: Ie17018222939c097e98a16762ec4ff4bef4e1836
2013-08-30 14:03:36 -07:00
Ed Tam
f85aa0fc12 Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev 2013-08-30 20:50:36 +00:00
Jesse Hall
0fa257fe53 EGL10.eglCreateWindowSurface should set producerControlledByApp
Bug: 10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
2013-08-30 13:49:14 -07:00
Jim Miller
dd238b5604 Merge "Attempt to fix missing clock bug" into klp-dev 2013-08-30 19:55:42 +00:00
Vinit Deshapnde
90b9180580 Merge "Synchronize access to single supplicant path" into klp-dev 2013-08-30 19:48:13 +00:00
Vinit Deshapnde
fab5c2b28e Synchronize access to single supplicant path
Both wlan0 and p2p0 state machines are accessing the supplicant socket
simultaneously; and may get responses of each other's command. This
change introduces synchronization between these two processes.

Bug: 10375978
Change-Id: I0ac0b2771311b642affc353958cc9ba2e5dd5716
2013-08-30 12:31:25 -07:00
Jonathan Dixon
7ef3bfec0a Merge "Remove WebViewClassic specific test code" into klp-dev 2013-08-30 19:15:41 +00:00
Zhentao Sun
ef9778ba39 Merge "Fixed b/10512887." into klp-dev 2013-08-30 19:11:29 +00:00
Martijn Coenen
52246087f4 HCE API review.
Keeping some of the old stuff @hide until all
clients have upgraded.

Bug: 10550349
Change-Id: Id5de7ab74c9b38c179fd20bd4746d95b7df8f033
2013-08-30 11:29:45 -07:00
Jeff Hao
ac27705f75 Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
Bug: 9968521

Change-Id: Ic63340e0d2fef18f27fdfabdd056ac5304c3d54f
(cherry picked from commit ffbe799f3824f4be705ca726988355d3943a9004)
2013-08-30 18:02:52 +00:00
Fabrice Di Meglio
e3d64640f1 Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into klp-dev 2013-08-30 18:00:19 +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
Selim Gurun
51e4c4c13b Merge "DO NOT MERGE Printing API changes for supporting better page layout" into klp-dev 2013-08-30 17:09:23 +00:00
John Spurlock
b7cdbcef9e Add a few SystemUI xxhdpi stragglers.
Bug: 10316062
Change-Id: I1307d7188e8326407c562a1f65f100e6a3dca5ed
2013-08-30 15:39:02 +00:00
Selim Gurun
030d8b0d1b DO NOT MERGE Printing API changes for supporting better page layout
Bug: 10507857
Change-Id: I3120ebfd11716259b9a83312b95a6a3f98a23d89
2013-08-30 08:30:52 -07:00
John Spurlock
81e0b1bd83 Improve signal assets against tranparent bkgrnd.
And update ringer icons, restoring their previous optical bounds.

Bug:10546772
Change-Id: If05a1cd674453b496d25dddfe185783abec93f5e
2013-08-30 09:47:42 -04:00
Ben Murdoch
e2acbcc005 Merge "Fix for 10530176 - CookieSyncManager must be created by WebView c'tor" into klp-dev 2013-08-30 09:03:59 +00:00
Wink Saville
e8fcfd53f6 Merge "Add debug and remove SocketTimeoutException." into klp-dev 2013-08-30 03:30:51 +00:00
Jim Miller
0d72b3e052 Merge "Disable hotword detection on low-memory devices" into klp-dev 2013-08-30 02:12:27 +00:00
Jim Miller
d54281061c Disable hotword detection on low-memory devices
Change-Id: If21f852af36a8f6dea17f3a87b22f39db3d1d6e8
2013-08-29 18:58:21 -07: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
John Spurlock
8f1f0109d3 Remove unused status bar help and obsolete resources.
Bug:10502089
Change-Id: I813244c4d5535256a56b242b92e6373edbbaba93
2013-08-29 21:02:15 -04:00
Matthew Williams
fda4698c25 Merge "Turn off debugging in SyncManager" into klp-dev 2013-08-30 00:24:11 +00:00
Jason Sams
c2b582c0b6 Merge "Cleanup API typo" into klp-dev 2013-08-30 00:03:36 +00:00
Jason Sams
a49e89d228 Cleanup API typo
bug 10548782

Change-Id: I3654b7d1f8ea10eb51006804248cc2a7d20eabb0
2013-08-29 17:00:37 -07:00
Zhentao Sun
d535ead295 Fixed b/10512887.
This is an issue caused by multi-threading. If geofence provider service
is connected and disconnected immediately, the ServiceWatcher can return a
null service handle to the private thread used by GeofenceProxy, and
this can cause NPE and system crash.
This CL also fixed a hidden race conditions bug where mGeofenceHardware
is not synchronized between two threads.

Change-Id: I824642cd638fbb1e6799a5a1220b047ebc2556a1
2013-08-29 16:56:19 -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
1c7674ef55 Merge "Don't show roaming icon for specific operators" into klp-dev 2013-08-29 23:17:50 +00: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
Adam Powell
2743990343 Merge "GridLayout changes for API council" into klp-dev 2013-08-29 22:38:24 +00:00
Matthew Williams
28b1fc6422 Turn off debugging in SyncManager
Bug: 10549076
Change-Id: I63ad8af5fbe8736eb7ca8307a4beef5310a1c10c
2013-08-29 22:30:43 +00:00
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
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
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
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