drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,009 Commits 1 Branch 0 Tags
Commit Graph

43534 Commits

Author SHA1 Message Date
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
3a9c7161df am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev 
* commit '6627e5b2aef2783cfa505a48195d7b8153eda25c':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
 2013-08-30 14:15:46 -07:00
Jesse Hall
6458257836 am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit '655cff1799c3b7cce616676500e38bf43f83bc34':
  EGL10.eglCreateWindowSurface should set producerControlledByApp
 2013-08-30 14:12:10 -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
Jesse Hall
0fa257fe53 EGL10.eglCreateWindowSurface should set producerControlledByApp 
Bug: 10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
 2013-08-30 13:49:14 -07:00
Jonathan Dixon
cfb0048b71 am 7ef3bfec: Merge "Remove WebViewClassic specific test code" into klp-dev 
* commit '7ef3bfec0aa171460d0c0a1072a887a1ce830206':
  Remove WebViewClassic specific test code
 2013-08-30 12:18:29 -07:00
Jonathan Dixon
7ef3bfec0a Merge "Remove WebViewClassic specific test code" into klp-dev 2013-08-30 19:15:41 +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
Fabrice Di Meglio
9385d5153e am e3d64640: Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into klp-dev 
* commit 'e3d64640f1083797cb188f08ff55a7d435f93eb9':
  Fix bug #10549094 KLP API Review: android.util.LayoutDirection
 2013-08-30 11:03:48 -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
Selim Gurun
629cafb693 am 51e4c4c1: Merge "DO NOT MERGE Printing API changes for supporting better page layout" into klp-dev 
* commit '51e4c4c13b75ecd47e328b0f4487ba9918a62589':
  DO NOT MERGE Printing API changes for supporting better page layout
 2013-08-30 10:16:11 -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
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
Ben Murdoch
ca34af6ad3 am e2acbcc0: Merge "Fix for 10530176 - CookieSyncManager must be created by WebView c\'tor" into klp-dev 
* commit 'e2acbcc0053eb9aac4ac17e1f0e8615556003da8':
  Fix for 10530176 - CookieSyncManager must be created by WebView c'tor
 2013-08-30 02:06:28 -07: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
Brian Carlstrom
61dbdabaf7 am 98c9491f: am 39e885dc: Merge "Make MeasuredText.sCached field final" 
* commit '98c9491f4d0854c4ba2de2071dee2548d572e6d0':
  Make MeasuredText.sCached field final
 2013-08-29 22:06:57 -07:00
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