111232 Commits

Author SHA1 Message Date
Kenny Root
580e60fdcd Merge "Use core-tests-support instead of core-tests" into klp-dev 2013-08-30 23:21:27 +00:00
Kenny Root
3603f04ab8 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.

(cherry picked from commit c2d6728350f3ec80f9b4c8967794558e42516987)

Bug: 10092469
Change-Id: Ib38364c607de5a98eb242050eaaf52b22ab8ca57
2013-08-30 16:18:56 -07: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
Jonathan Dixon
69f9f9305c Add tracing to WebView API methods and callbacks
Bug: 10488419

This is useful for debugging numerous SxS issues.

Change-Id: I5d0d2e253499741c5f9454582988c99e42dc0a81
2013-08-30 15:07:25 -07:00
Lajos Molnar
af30982435 VideoView: add addSubtitleSource
A way to add external subtitle file to VideoView.

Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
2013-08-30 14:59:46 -07:00
Alan Viverette
3f9832d3c7 Fix pre tag formatting in getDragToOpenListener documentation
BUG: 10549164
Change-Id: Ie3e05e918edbd737326c724e4e712279ac410238
2013-08-30 14:43:25 -07:00
Matthew Williams
9d7c4d4a6e Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev 2013-08-30 21:39:15 +00:00
Alan Viverette
083199efed Merge "Update captioning APIs" into klp-dev 2013-08-30 21:34:43 +00:00
Alan Viverette
cb168795fe Update internal AutoScrollHelper to match support lib version
BUG: 10547956
Change-Id: I7d5b1b9fb89ae8ff4294cc2dfd01e29b55ed3eba
2013-08-30 14:33:13 -07:00
Matthew Williams
6222288bfb DO NOT MERGE. Remove service component for KLP.
1) As discussed, lack of internal clients -> remove SyncService
component from KLP. This CL reverts that addition.
2) Also includes javadoc cleanup of existing API.
3) Fix naming of allowMetered() -> disallowMetered() in API
4) Removed one-off sync in the future, as it doesn't make sense
for sync adapters.

Change-Id: I1b17094e6edafb2955cdfb99f39b44274fbe86f9
2013-08-30 21:28:53 +00:00
Scott Main
c27ea258d2 clarify javadoc for constructors.
bug: 10563421

Change-Id: Ifa898005a13f987e4de07d1a34cb3b289d533256
2013-08-30 14:26:56 -07:00
Jeff Hao
6627e5b2ae Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev 2013-08-30 21:10:40 +00:00
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
Chong Zhang
e38af818b1 wifi-display: add a global setting to force WPS config method
Bug: 9371882
Change-Id: I7417535f12fa5b75be471974250cfd13e45f87b2
2013-08-30 10:40:35 -07: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
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
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
Chong Zhang
72193e1f32 wifi-display: disable WFD IE when Wifi display is turned off
Change-Id: Ibd7e3a59f7988975b4ac6c7efdba2b545097a2bd
2013-08-29 15:42:58 -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