Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,224 Commits 3 Branches 0 Tags
a2a772035f21cc8a04463360aa355e20044ff641
Commit Graph

31263 Commits

Author SHA1 Message Date
Jeff Sharkey
a2a772035f am 8c58b792: am cd6d7dee: Merge "Refactoring of DocumentsContract." into klp-dev 
* commit '8c58b79243748eeb98b650c8e660a742ad876452':
  Refactoring of DocumentsContract.
 2013-09-02 17:14:37 -07:00
Jeff Sharkey
8c58b79243 am cd6d7dee: Merge "Refactoring of DocumentsContract." into klp-dev 
* commit 'cd6d7deec8742e257a670db8e027f628afdf337e':
  Refactoring of DocumentsContract.
 2013-09-02 17:09:15 -07:00
Jeff Sharkey
cd6d7deec8 Merge "Refactoring of DocumentsContract." into klp-dev 2013-09-03 00:07:17 +00:00
Przemyslaw Szczepaniak
7a632f76f9 am 0b162145: am 61dda198: Fix SynthesisRequest javadoc 
* commit '0b1621459378122cb92945a0c6ca1142da7fe9ac':
  Fix SynthesisRequest javadoc
 2013-09-02 09:49:24 -07:00
Przemyslaw Szczepaniak
0b16214593 am 61dda198: Fix SynthesisRequest javadoc 
* commit '61dda198598e95971ca224e3bcb7393f30e45657':
  Fix SynthesisRequest javadoc
 2013-09-02 09:47:51 -07:00
Przemyslaw Szczepaniak
61dda19859 Fix SynthesisRequest javadoc 
Bug: 10548784
Change-Id: I76a89bb9accdeee00c60a668adbdd789b995cd92
 2013-09-02 16:41:05 +01: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
Jeff Sharkey
ae9b51bfa3 Refactoring of DocumentsContract. 
Combines related columns and constants onto the same class so they
are easier to discover.  Move back to surfacing roots with columns
so they are consistent with documents.

Advanced roots are represented with a flag instead of distinct
types.  Flags to indicate supporting of well-known media types,
instead of arbitrary an MIME filter.  Reintroduce well-formed rootId
to support recents.

Always use the expanded version of "documents" in constants, methods,
and argument names.

Refactor DocumentProvider method names to clearly distinguish if
a single item or multiple could be returned, and of which type.  Add
documentation to clearly define which methods have already been
overridden.

Bug: 10567506, 10567557
Change-Id: I981f26ab82f2b520a19aa1ce66f659de50d7fac0
 2013-08-31 16:58:28 -07:00
Alan Viverette
8d1a22f0a8 am 3e09c1a3: am 083199ef: Merge "Update captioning APIs" into klp-dev 
* commit '3e09c1a3c63b242b6d83671e8409f44d371cb9a3':
  Update captioning APIs
 2013-08-30 14:42:49 -07:00
Matthew Williams
eea358a70b am 9d7c4d4a: Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev 
* commit '9d7c4d4a6e4683862931b3a11c974715073514ab':
  DO NOT MERGE. Remove service component for KLP.
 2013-08-30 14:42:02 -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
3e09c1a3c6 am 083199ef: Merge "Update captioning APIs" into klp-dev 
* commit '083199efed839274619eb7a003a7d7c9229e5ffc':
  Update captioning APIs
 2013-08-30 14:38:20 -07:00
Alan Viverette
083199efed Merge "Update captioning APIs" into klp-dev 2013-08-30 21:34:43 +00: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
Jeff Hao
c0a38c227e am 3a9c7161: am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev 
* commit '3a9c7161dfd6f16baddd2eb209a013609b927da7':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
 2013-08-30 14:17:27 -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
Jeff Hao
6627e5b2ae Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev 2013-08-30 21:10:40 +00:00
Fabrice Di Meglio
3265685e4d am 9385d515: am e3d64640: Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into klp-dev 
* commit '9385d5153e20dc4125d4e0519b0a82de143b5194':
  Fix bug #10549094 KLP API Review: android.util.LayoutDirection
 2013-08-30 11:06:19 -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
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
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
76208b7a0e am ca34af6a: am e2acbcc0: Merge "Fix for 10530176 - CookieSyncManager must be created by WebView c\'tor" into klp-dev 
* commit 'ca34af6ad3fbbdaa0eb2932cb5b17b187a1f86ec':
  Fix for 10530176 - CookieSyncManager must be created by WebView c'tor
 2013-08-30 02:09:25 -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
22af3efbb3 am 61dbdaba: am 98c9491f: am 39e885dc: Merge "Make MeasuredText.sCached field final" 
* commit '61dbdabaf71bd7b9eb25b587b1faeb10fd1da527':
  Make MeasuredText.sCached field final
 2013-08-29 22:09:16 -07: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
Wink Saville
90c7480168 am 16811725: am e8fcfd53: Merge "Add debug and remove SocketTimeoutException." into klp-dev 
* commit '1681172544af7b43f7048ee703a26d127d5bc7aa':
  Add debug and remove SocketTimeoutException.
 2013-08-29 20:36:34 -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
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
Adam Powell
bdb284c516 am 91fa056a: am 27439903: Merge "GridLayout changes for API council" into klp-dev 
* commit '91fa056a58fdad8f8e6e8a76a902c2a566364f29':
  GridLayout changes for API council
 2013-08-29 15:43:04 -07: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
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
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
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