Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,389 Commits 3 Branches 0 Tags
856441e72fa6a79a5421e9538e5af17df281eaab
Commit Graph

32061 Commits

Author SHA1 Message Date
Eino-Ville Talvala
eef7e31c2d am 079320a2: am 3f48f6aa: Merge "Camera2: Verbosity is verboten." into klp-dev 
* commit '079320a2adb2654c6aa008ae7f369c538434abfa':
  Camera2: Verbosity is verboten.
 2013-10-04 15:33:06 -07:00
Eino-Ville Talvala
3f48f6aa6c Merge "Camera2: Verbosity is verboten." into klp-dev 2013-10-04 22:27:59 +00:00
Chet Haase
280d250c70 am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 
* commit '956b23f4e3b9cac88ea4627bbe4783b165beec03':
  Fix infinite recursion in hashcode of Spannables
 2013-10-04 15:18:56 -07:00
Svetoslav Ganov
0d9ff1613a am 538df343: am 331f9e79: Merge "Print attributes hint not honored." into klp-dev 
* commit '538df3437b80d15b07cda2464b2ae4e5bae8219b':
  Print attributes hint not honored.
 2013-10-04 15:14:15 -07:00
Chet Haase
a0364e2360 Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 2013-10-04 22:12:09 +00:00
Alan Viverette
6de0ee41f9 am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 
* commit '8d6730fd30dd6aa4b186591f210dd5e74d117921':
  Fix font scaling issues in FastScroller and SubtitleView
 2013-10-04 15:10:19 -07:00
Raph Levien
a488c79605 am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 
* commit '2a32771ace5250ec919a08da688e2d6c91e5c132':
  Fix Text appears on top of existing text when composing in gmail.
 2013-10-04 15:10:13 -07:00
Svetoslav Ganov
331f9e79ad Merge "Print attributes hint not honored." into klp-dev 2013-10-04 22:08:25 +00:00
Alan Viverette
b89e969cef Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 2013-10-04 22:04:00 +00:00
Raph Levien
24871f6375 Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 2013-10-04 22:02:56 +00:00
Jeff Sharkey
43fac87f2a am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 
* commit '77b7f39f512a34a9af0013cc7e01142192901d67':
  Avoid NPE when ProviderInfo is missing.
 2013-10-04 14:56:18 -07:00
Jeff Sharkey
fc141ef20b Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 2013-10-04 21:49:07 +00:00
Eino-Ville Talvala
51ca8d6bc0 Camera2: Verbosity is verboten. 
Bug: 10360518
Change-Id: I155effad61099535bee77cc0d0e380420d96770d
 2013-10-04 14:39:58 -07:00
Alex Ray
849ef427b8 am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev 
* commit '2bbf0bfc16358382589d56efcc0ea9e63807e941':
  Add Consumer IR feature
 2013-10-04 14:18:37 -07:00
Alex Ray
0ab7c883d5 Merge "Add Consumer IR feature" into klp-dev 2013-10-04 21:13:35 +00:00
Jeff Sharkey
9095c5a823 Avoid NPE when ProviderInfo is missing. 
Bug: 11052428
Change-Id: I6cb0cf2030a28f571c3f13cd0b9ba76627974697
 2013-10-04 13:53:50 -07:00
Robert Greenwalt
72566b98db am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev 
* commit '1c6fdd6c7b58b7f25d49fd26a29a03a478cc5937':
  Revert "Use a build-specific wifi country code"
 2013-10-04 13:34:22 -07:00
Robert Greenwalt
1db7024c50 am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev 
* commit '2e23484eec2321537e843168f76cba4c18b56f95':
  Un-deprecate getDhcpInfo
 2013-10-04 13:34:08 -07:00
Svetoslav Ganov
7be27acac9 Print attributes hint not honored. 
1. Initially we have a single printer, the fake PDF printer, and
   wait for printers to be discovered. This printer was handling
   only a couple of media sizes. Hence, if the app provides a
   media size hint and the PDF printer does not support it, we
   were essentially ignoring the suggested media size since it
   was not supported by the selected printer and we fell back to
   the default paper size for that printer. The fake PDF printer
   should support all predefined media sizes.

2. The list of available paper sizes was shown in the order they
   are added ignoring the current locale. It is much better user
   experience if the media sizes used in the current locale are
   shown at the top and all others after that. Also the media
   sizes for the current locale should be alphabetically ordered
   so the user can quickly find the desired one.

3. The orientation was reset on media size or printer change.

bug:10564537

Change-Id: Iaa0d42242730ce69cea3effd4d0f4bc087068804
 2013-10-04 11:45:15 -07:00
Alan Viverette
7b63063625 Fix font scaling issues in FastScroller and SubtitleView 
BUG: 11080227
Change-Id: I0aa84e9b56c6900ad47efd45a5a0f772ce43f810
 2013-10-04 11:44:51 -07:00
Robert Greenwalt
cac2fd302e Merge "Revert "Use a build-specific wifi country code"" into klp-dev 2013-10-04 18:33:51 +00:00
Robert Greenwalt
f3f1a37093 Merge "Un-deprecate getDhcpInfo" into klp-dev 2013-10-04 18:07:34 +00:00
Robert Greenwalt
cb2fe96f2c Un-deprecate getDhcpInfo 
Replacement api isn't available.

bug:10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
 2013-10-04 09:53:39 -07:00
Chet Haase
1d3c4b396a Fix infinite recursion in hashcode of Spannables 
An app created a SpannableStringBuilder, one of which's spans was the
instance of the string builder itself (that is, the builder contained a span
that was the builder). This caused infinite recursion in the hashcode()
method because it computes a hash from its fields, including all of its spans.

The fix detects the case where a span equals the current instance and
noops the computation on that span. A similar adjustment was made to equals()
to avoid the same recursion problem.

Issue #11051658 StackOverflowError in android.text.SpannableStringBuilder.hashCode

Change-Id: I742687ab32d81ac51c4b9135f698cf5e96a1d295
 2013-10-04 07:24:19 -07:00
Jonathan Dixon
3bd13f3a74 am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassic 
* commit '6079dbc1ae0fe0c8c8d642d072514e1ea94d1ac5':
  Fix CookieSyncManager for WebViewClassic
 2013-10-04 07:23:05 -07:00
Jonathan Dixon
050c552f09 Fix CookieSyncManager for WebViewClassic 
Add a workaround to ensure that the WebViewDatabase and JniUtil can
still be initialized as side effect of making a CookieSyncManager

This was collateral damage from the fixes for Bug 10932261

Change-Id: If5ba65a7822d5b0afc14139dd84125058bf96897
 2013-10-04 14:23:47 +01:00
Wink Saville
e7329140c0 am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'fe587dba3a70c658140eac1b13996b7d8e6eeda2':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-03 21:30:29 -07:00
Alex Ray
0c9d61f098 Add Consumer IR feature 
Bug: 10676690
Change-Id: Id2c118225dc6ef259f5ed97da4071e9b6de3a83a
 2013-10-03 18:19:38 -07:00
Wink Saville
a48ccdd6fb Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 2013-10-04 00:52:59 +00:00
Alan Viverette
92a827b816 am a6125957: am 093318ee: Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev 
* commit 'a612595733483213d757fd1bb9c976b06d61a38b':
  Add importantForAccessibility mode to block entire hierarchy
 2013-10-03 15:41:41 -07:00
Dianne Hackborn
8a5f7ab6e1 am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '22c298a5df7a9fa53826ecfa4925372b1eebf8bc':
  KLP/KitKat is now API 19.
 2013-10-03 15:39:44 -07:00
Jonathan Dixon
34eb4f3d16 am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 
* commit '4730dda880097b1c25096e323be8a527fd6e0b09':
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
 2013-10-03 15:39:42 -07:00
Eino-Ville Talvala
61e5349dfb am 31ea028e: am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev 
* commit '31ea028e71af59ebf7b5fe9dd215e61b8d86d162':
  Camera2: Implement idle callbacks
 2013-10-03 15:39:39 -07:00
Dianne Hackborn
7c55154d47 am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '80e75d3946fd4c5cdd913d217df1b8d32ec464ee':
  Implement issue #11050739: Show swapped out RAM
 2013-10-03 15:39:36 -07:00
Dianne Hackborn
61509ca5ba am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '479dde0bc21a1e9d0bb8dad801cfe015f6c7e416':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-03 15:39:33 -07:00
Dianne Hackborn
5eaac1ce33 am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit 'e31f959c68a9dfa00daa5b5580ced31badfb1127':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-03 15:39:30 -07:00
Dianne Hackborn
495fe22d68 am 2d3f995a: am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit '2d3f995a65f2acd60559b1db57ae3ab2346a1df0':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-03 15:39:27 -07:00
Daniel Sandler
12aea9d797 am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev 
* commit '97bc628fa737a87b0b855b76404fd1527eca67f8':
  Goo goo ga joob.
 2013-10-03 15:39:24 -07:00
Marco Nelissen
d9ff894eae am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit '05f56fc121e176ef4e227639a7b636a875f38037':
  Add PowerManager method to assign blame to a single uid
 2013-10-03 15:39:18 -07:00
John Spurlock
bee8af8207 am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'c3752cfb6d5381795433ccdbcd8f84cada832790':
  Store decor rects per window for transition cropping.
 2013-10-03 15:38:52 -07:00
Christopher Tate
64884eef54 am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit 'b61c82190d9d16cd4a7dff8af81aff7f43c19cc4':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 15:38:47 -07:00
Adam Lesinski
b2db2fbce3 am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit '6d90862f2387d24c28e9d1c8f080cb9a4ff15011':
  Private flags are masked in correct variable
 2013-10-03 15:38:44 -07:00
John Reck
cd6a2d3079 am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit '47dc3248e09002a5a55dc427f752da8ebd623868':
  Reduce max recents on lowram
 2013-10-03 15:38:38 -07:00
Raph Levien
63b3eb6523 Fix Text appears on top of existing text when composing in gmail. 
Fix for bug 6473708. This patch changes from "last update wins" to
merging together the change regions, in the logic of deciding which
blocks need to be updated for painting, so that when there are multiple
changes batched for a draw, they're all taken into account.

Change-Id: I183d453c436125e5efec7031b4d61b43989653f9
 2013-10-03 14:28:54 -07:00
Robert Greenwalt
3ea0c99b67 Revert "Use a build-specific wifi country code" 
This reverts commit c33cd23c17.

bug:11064682
Change-Id: I35825a7005e75f3abf02f23f31dee1cb7b101c31
 2013-10-03 21:15:54 +00:00
Alan Viverette
093318eeac Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev 2013-10-03 20:33:56 +00:00
Dianne Hackborn
7192c6d7c6 Merge "KLP/KitKat is now API 19." into klp-dev 2013-10-03 19:19:10 +00:00
Dianne Hackborn
6bc3789b39 KLP/KitKat is now API 19. 
Bug: 10348975

Change-Id: I19bf1a56064deda2e59085520960aac8ce3a825b
 2013-10-03 12:17:31 -07:00
Jonathan Dixon
46507f4bc7 Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 2013-10-03 18:52:56 +00:00
Eino-Ville Talvala
b77b7babd5 Merge "Camera2: Implement idle callbacks" into klp-dev 2013-10-03 18:33:54 +00:00