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

106031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
1d7c218ba2 MediaDrm API: Add two exceptions to handle error path scenarios 
bug: 8725707
Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
 2013-04-30 12:39:04 -07:00
Elliott Hughes
31872fd7ce am a99595a3: am afe56810: Merge "Fix DatePicker\'s spinner order in various locales." 
* commit 'a99595a393341b6a130e202bc9e93848ee53057b':
  Fix DatePicker's spinner order in various locales.
 2013-04-30 12:17:27 -07:00
Elliott Hughes
ba8d2e58f8 am c2639e58: am 0bb4c701: Merge "Use ICU for getDateFormatOrder." 
* commit 'c2639e58fa5724c06a1d910ad76aebed647b4ba2':
  Use ICU for getDateFormatOrder.
 2013-04-30 12:17:25 -07:00
Elliott Hughes
a99595a393 am afe56810: Merge "Fix DatePicker\'s spinner order in various locales." 
* commit 'afe56810517a4ddfad125029ca04fd4cc5af2ef5':
  Fix DatePicker's spinner order in various locales.
 2013-04-30 12:15:06 -07:00
Elliott Hughes
c2639e58fa am 0bb4c701: Merge "Use ICU for getDateFormatOrder." 
* commit '0bb4c701bab0f69172417b7a511acb6bdfa052db':
  Use ICU for getDateFormatOrder.
 2013-04-30 12:15:00 -07:00
Romain Guy
6628ee7a46 Merge "HeaderViewListAdapter: Correct thrown error names." 2013-04-30 19:11:22 +00:00
Taylor H. Perkins
62b2bb80f6 HeaderViewListAdapter: Correct thrown error names. 
When accessing an invalid entry of the list, an IndexOutOfBounds exception is thrown, not an ArrayIndexOutOfBounds exception.

Change-Id: I3cf59faab004fa6391d84f30f280e0c9bd92dc44
Signed-off-by: Taylor H. Perkins <taylorhp@gmail.com>
 2013-04-30 12:04:52 -07:00
Romain Guy
4225d79656 Merge "Handle Surface::lock errors in TextureView Bug #8689535" 2013-04-30 18:58:17 +00:00
Elliott Hughes
afe5681051 Merge "Fix DatePicker's spinner order in various locales." 2013-04-30 18:40:01 +00:00
Romain Guy
9e37d590a6 Merge "Fix TextClock documentation Bug #8670351" 2013-04-30 18:31:29 +00:00
Romain Guy
53bacf5a91 Handle Surface::lock errors in TextureView 
Bug #8689535

Change-Id: I6d16e13903a58e93940160e7656147656ab79982
 2013-04-30 11:30:10 -07:00
Elliott Hughes
0bb4c701ba Merge "Use ICU for getDateFormatOrder." 2013-04-30 18:22:18 +00:00
Romain Guy
09b1994c4d Fix TextClock documentation 
Bug #8670351

Change-Id: I87a906b85b51f44d9dcecb6f137db53886323ad7
 2013-04-30 11:19:39 -07:00
Romain Guy
efb709adfe Prevent TextureView from ever setting a null layer paint 
Bug #8760436

DO NOT MERGE

Change-Id: I7e4d09fa534f539cb99ebeaa8159fb11920460cf
 2013-04-30 11:13:00 -07:00
Elliott Hughes
659f145278 Fix DatePicker's spinner order in various locales. 
DatePicker always effectively uses yyyy MMM dd, so we need to ask
icu4c what order those should appear in for the user's locale. The
existing DateFormat code was an approximation that worked for en_US
but not for all languages (fa being one example).

Bug: 7207103
Change-Id: I7b12568dbc02522ebad6e1db5f8426109cd6f7ce
 2013-04-30 11:11:53 -07:00
Elliott Hughes
edd6f9e688 Use ICU for getDateFormatOrder. 
Bug: 7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
 2013-04-30 11:09:53 -07:00
Svetoslav
f6a2598fc4 Merge "Removing a debug check when logging fstrim events." into jb-mr2-dev 2013-04-30 18:05:48 +00:00
Svetoslav
9e814a8c02 Removing a debug check when logging fstrim events. 
This change is removing the check for debuggable build to
log fstrim events. While this was done everywhere else, one
place was overlooked.

bug:8688454

Change-Id: I354e1deebfd801f971dd91b9e7972c6ebfd093f3
 2013-04-30 10:43:59 -07:00
Svetoslav
cff4b18eeb Merge "Perform idle maintenance when the device is charging." into jb-mr2-dev 2013-04-30 17:41:21 +00:00
Romain Guy
f9aca99353 Merge "Prevent TextureView from ever setting a null layer paint" 2013-04-30 17:26:10 +00:00
Romain Guy
c2079c968d Prevent TextureView from ever setting a null layer paint 
Change-Id: If9a418b7eb9969410286df43ee805cd7d8ec17b2
 2013-04-30 10:25:35 -07:00
Svetoslav
f23b64df94 Perform idle maintenance when the device is charging. 
Added the precondition that the device should be charging to the
existing ones of the device not being used for awhile and the
battery level being high enough. Note that even if the device is
charging, we have to check the battery level since the user can
unplug it at any time.

bug:8688454

Change-Id: I709b1620571301743dc3504a6a625e2018951bfa
 2013-04-30 10:19:53 -07:00
Kenny Root
178e8bbf25 am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp 
* commit 'e9ae6822a80cb1f3bd13c785f1727c03d35da52e':
  Track change to JSSE provider
 2013-04-30 09:01:38 -07:00
John Reck
6a5a04ae66 am be53f180: am 28d91bdb: Merge "Revert "Can not mark the same content of browser page after copy"" 
* commit 'be53f1806cf9f0ec69f785a0063227e0ed795eb8':
  Revert "Can not mark the same content of browser page after copy"
 2013-04-30 09:01:35 -07:00
Kenny Root
590bca3b24 resolved conflicts for merge of 09ab7ef9 to master 
Change-Id: I505317d0cde7a6daf0fd50b20cba21aa55693263
 2013-04-30 09:00:14 -07:00
Irfan Sheriff
3ddee7d6e9 am fd0b0072: am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev 
* commit 'fd0b0072db6d89c85a5ea20383a1c3dc289d1d38':
  Remove scan notification dialog on wifi off
 2013-04-30 08:54:22 -07:00
Nick Kralevich
b7294d74dd am 5dc2ac4d: am 7318b840: am ec3396af: am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '5dc2ac4d7b5fdc7d3c1d9c60c47ad654ca55738d':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-30 08:54:18 -07:00
Christopher Tate
83725360f9 am 21675166: am bd1730de: Merge "Document the \'aapt dump strings\' command" 
* commit '21675166345646f5bb278af487e69604290f09b0':
 2013-04-30 08:54:13 -07:00
Kenny Root
10dd0d818e am d334cb13: am d152f7ec: Merge "Don\'t use X509CertImpl directly" 
* commit 'd334cb13d694a4f1c6b885070ec48033366a4b37':
 2013-04-30 08:54:02 -07:00
Kenny Root
f80d45bfc4 resolved conflicts for merge of 3424b817 to master 
Change-Id: Idb5bb208aa6aca66744fe6988029d22e739cc67b
 2013-04-30 08:45:12 -07:00
Zhentao Sun
752625c844 am 460778f1: am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev 
* commit '460778f10475bb9fa02cbfe8af7faef38807435c':
  Fixed race conditions in GeofenceHardwareImpl.
 2013-04-30 08:31:46 -07:00
Kenny Root
2074fcb4dd resolved conflicts for merge of ee4e9530 to master 
Change-Id: I33931a962aff0ee8f6a04972afb0147e46b57baf
 2013-04-30 08:29:25 -07:00
Baligh Uddin
592190d234 Merge "Import translations. DO NOT MERGE" 2013-04-30 14:56:13 +00:00
Baligh Uddin
f0e8c78a11 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-30 14:54:27 +00:00
Chet Haase
6b313da0d8 Merge "Clarify behavior of fullscreen mode and softInputMode's adjustResize" into jb-mr2-dev 2013-04-30 14:45:46 +00:00
Kenny Root
e9ae6822a8 resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp 
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
 2013-04-29 23:09:03 -07:00
John Reck
be53f1806c am 28d91bdb: Merge "Revert "Can not mark the same content of browser page after copy"" 
* commit '28d91bdbde63ba1afe3bb67c5466527ec7184217':
  Revert "Can not mark the same content of browser page after copy"
 2013-04-29 22:53:57 -07:00
Michael Wright
09ab7ef9f7 resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp 
Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d
 2013-04-29 22:50:43 -07:00
Baligh Uddin
d976fe792e Import translations. DO NOT MERGE 
Change-Id: I1c5619a53271ddb3289ef2b6527274ef252e35e0
Auto-generated-cl: translation import
 2013-04-29 22:48:39 -07:00
Baligh Uddin
4431fbea94 Import translations. DO NOT MERGE 
Change-Id: I98754953f5b7d08dd0bac3510be1c5c082529b79
Auto-generated-cl: translation import
 2013-04-29 22:34:34 -07:00
Baligh Uddin
74b736fd1c Import translations. DO NOT MERGE 
Change-Id: Ic7fe032626cac3828e5b1eeaf9f4b4513a46b77a
Auto-generated-cl: translation import
 2013-04-29 22:25:03 -07:00
Kenny Root
1f6e789b7e Merge "Track change to JSSE provider" 2013-04-30 04:02:01 +00:00
Mike Lockwood
16ac261b36 Merge "Fix javadoc errors for @deprecated tags with no explanatory comment" 2013-04-30 01:24:54 +00:00
John Reck
28d91bdbde Merge "Revert "Can not mark the same content of browser page after copy"" 2013-04-30 01:21:31 +00:00
Mike Lockwood
322780496f Fix javadoc errors for @deprecated tags with no explanatory comment 
Change-Id: I38a31facf7d4a9cd13645516f25b4305df65c618
 2013-04-29 18:21:25 -07:00
Jeff Sharkey
9e5045db93 Merge "Add longpress support to keyevent." 2013-04-30 01:18:30 +00:00
John Reck
8717061f5b Revert "Can not mark the same content of browser page after copy" 
This reverts commit 2b3cef0dd74cb9470e5387b015ee7a13af1fff7b

Causes crashes in Email, reverting for now

Change-Id: Ia0286763d0ab1f90c2b6082d44a6ca804769f49c
 2013-04-30 01:17:15 +00:00
Alan Viverette
561dcc5823 Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev 2013-04-30 01:11:08 +00:00
Craig Mautner
9db9a0bde5 Move task methods into TaskRecord. 
Stop doing backflips to do task operations in ActivityStack.

Change-Id: I57b1be6affcb8b7d504ae33b3e44bde2e6253f1c
 2013-04-29 17:05:56 -07:00
Mike Lockwood
17195e0378 Merge "Remove obsolete OMA-DRM support" 2013-04-30 00:00:00 +00:00