OSDN Git Service
Jesse Hall [Wed, 1 May 2013 02:38:14 +0000 (19:38 -0700)]
am
0b30ad53: am
09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev
* commit '
0b30ad53423a9bfab53b1632a33159be3d82e3df':
Fix GLES30 JNI registration
Jesse Hall [Wed, 1 May 2013 02:36:03 +0000 (19:36 -0700)]
am
09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev
* commit '
09f3cc2bcca62fea30dc0f22cc120088e9f54728':
Fix GLES30 JNI registration
Jesse Hall [Wed, 1 May 2013 02:31:55 +0000 (02:31 +0000)]
Merge "Fix GLES30 JNI registration" into jb-mr2-dev
Romain Guy [Wed, 1 May 2013 01:19:34 +0000 (18:19 -0700)]
am
fa4eb085: am
b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #
8760436" into jb-mr2-dev
* commit '
fa4eb085c3f01c0b659c37be585c13f0a9a3b360':
Prevent TextureView from ever setting a null layer paint Bug #
8760436
Romain Guy [Wed, 1 May 2013 01:16:11 +0000 (18:16 -0700)]
am
b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #
8760436" into jb-mr2-dev
* commit '
b107b7e9ecaee799a7a18b8ab897969ef554fd9b':
Prevent TextureView from ever setting a null layer paint Bug #
8760436
Romain Guy [Wed, 1 May 2013 01:14:41 +0000 (01:14 +0000)]
Merge "Prevent TextureView from ever setting a null layer paint Bug #
8760436" into jb-mr2-dev
Christopher Tate [Wed, 1 May 2013 00:50:50 +0000 (17:50 -0700)]
am
6e629e84: am
95a9bfe2: When installing/enabling a system app, bootstrap it
* commit '
6e629e84c52c870ff6fe6d0493861997929209f4':
When installing/enabling a system app, bootstrap it
Christopher Tate [Wed, 1 May 2013 00:48:59 +0000 (17:48 -0700)]
am
95a9bfe2: When installing/enabling a system app, bootstrap it
* commit '
95a9bfe2ba75d79fff8157ed57e75c4ffb5a08ac':
When installing/enabling a system app, bootstrap it
Christopher Tate [Wed, 1 May 2013 00:40:32 +0000 (17:40 -0700)]
When installing/enabling a system app, bootstrap it
Specifically, send it a BOOT_COMPLETED broadcast just as it would have
received during device (or user) startup.
Bug
8594153
Change-Id: I847c16df56d038a25758e594f951bc15348edc19
Casey Burkhardt [Wed, 1 May 2013 00:26:14 +0000 (17:26 -0700)]
am
dd7d8ec1: am
203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
* commit '
dd7d8ec17ec1129f33764e025366129d3562ea7e':
Rebuilds ActionBar accessibility description as needed
Casey Burkhardt [Wed, 1 May 2013 00:20:12 +0000 (17:20 -0700)]
am
203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
* commit '
203aa72e747794a64a8262ceb6c9cdc8381e77cb':
Rebuilds ActionBar accessibility description as needed
Chet Haase [Wed, 1 May 2013 00:18:07 +0000 (17:18 -0700)]
am
a111ceab: am
a934ad11: Merge "Speed up user-switching wallpaper changes" into jb-mr2-dev
* commit '
a111ceab03410100a4b67328a99feb6299bd7bc5':
Speed up user-switching wallpaper changes
Casey Burkhardt [Wed, 1 May 2013 00:15:43 +0000 (00:15 +0000)]
Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
Chet Haase [Wed, 1 May 2013 00:04:58 +0000 (17:04 -0700)]
am
a934ad11: Merge "Speed up user-switching wallpaper changes" into jb-mr2-dev
* commit '
a934ad112c9da1c7a342a990fcb06bae2ea7485e':
Speed up user-switching wallpaper changes
Svetoslav [Tue, 30 Apr 2013 23:45:49 +0000 (16:45 -0700)]
am
5473ffba: am
f6a2598f: Merge "Removing a debug check when logging fstrim events." into jb-mr2-dev
* commit '
5473ffba405af12f2c5d3a7363ed959a9648eaf4':
Removing a debug check when logging fstrim events.
Svetoslav [Tue, 30 Apr 2013 23:45:47 +0000 (16:45 -0700)]
am
86fe273f: am
cff4b18e: Merge "Perform idle maintenance when the device is charging." into jb-mr2-dev
* commit '
86fe273f26ff8957a096911a20f4a48df5de470a':
Perform idle maintenance when the device is charging.
Baligh Uddin [Tue, 30 Apr 2013 23:45:45 +0000 (16:45 -0700)]
am
5bf93be4: (-s ours) am
f0e8c78a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
5bf93be4f45d62e685d2d124fa105d7fe5e9ffd1':
Import translations. DO NOT MERGE
Chet Haase [Tue, 30 Apr 2013 23:45:42 +0000 (16:45 -0700)]
am
8afd195d: am
6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev
* commit '
8afd195d47d2813822a388fbd0ea69228deafcf0':
Clarify behavior of fullscreen mode and softInputMode's adjustResize
Svetoslav [Tue, 30 Apr 2013 23:42:58 +0000 (16:42 -0700)]
am
f6a2598f: Merge "Removing a debug check when logging fstrim events." into jb-mr2-dev
* commit '
f6a2598fc4a1595e9fb77bd542047a4c8006d337':
Removing a debug check when logging fstrim events.
Svetoslav [Tue, 30 Apr 2013 23:42:54 +0000 (16:42 -0700)]
am
cff4b18e: Merge "Perform idle maintenance when the device is charging." into jb-mr2-dev
* commit '
cff4b18eeb35c832d0d48ca539ec722d9159ec70':
Perform idle maintenance when the device is charging.
Baligh Uddin [Tue, 30 Apr 2013 23:42:36 +0000 (16:42 -0700)]
am
f0e8c78a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
f0e8c78a11c43f23ea314166707039e2c4b5361f':
Import translations. DO NOT MERGE
Chet Haase [Tue, 30 Apr 2013 23:42:33 +0000 (16:42 -0700)]
am
6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev
* commit '
6b313da0d89564711acfc8c66b7790da0f52d187':
Clarify behavior of fullscreen mode and softInputMode's adjustResize
Dmitry Shmidt [Tue, 30 Apr 2013 23:26:42 +0000 (16:26 -0700)]
am
e1c09484: am
ddf7a066: (-s ours) Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp"
* commit '
e1c094842cf9b751f16df8f8baf65565a842e6ff':
framework:When turn off of SoftAp immediately call turning ON SoftAp
Dmitry Shmidt [Tue, 30 Apr 2013 23:25:08 +0000 (16:25 -0700)]
am
ddf7a066: (-s ours) Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp"
* commit '
ddf7a0660c456a975b12794c54fd6681e422ef29':
framework:When turn off of SoftAp immediately call turning ON SoftAp
Casey Burkhardt [Tue, 30 Apr 2013 22:56:41 +0000 (15:56 -0700)]
Rebuilds ActionBar accessibility description as needed
Previously, ActionBarView only updated the contentDescription for the navigate
up/home affordance when it is enabled or disabled. This causes that description
to be rebuilt and applied whenever the title or subtitle of the view is changed.
This also inadvertantly removes whitespace in ActionBarView.
Bug:
8757286
Change-Id: I1ea02cad20e0d5c0c57d071727cc647c4dd52d44
Chet Haase [Tue, 30 Apr 2013 22:42:49 +0000 (22:42 +0000)]
Merge "Speed up user-switching wallpaper changes" into jb-mr2-dev
Jeff Sharkey [Tue, 30 Apr 2013 22:14:12 +0000 (22:14 +0000)]
Merge "Better --unplugged support when dumping battery."
Chet Haase [Tue, 30 Apr 2013 22:10:51 +0000 (15:10 -0700)]
Speed up user-switching wallpaper changes
Previous work in ImageWallpaper cached the bitmap for a user
to avoid reloading it (an expensive operation on large-display devices)
when we could simply re-use it. User switching still caused a reload, however,
since the place where we cache the bitmap (ImageWallpaper) is in an instance
that is re-created on user-switch.
A simple fix is to have the ImageWallpaper stop telling the WallpaperManager
to erase its own cache of the bitmap prior to re-loading it. That step is
unnecessary, since a bitmap that is cached can be assumed to be valid. A wallpaper
change will correctly null out that cached version, so if the cached bitmap
is non-null, then we can simply use it as-is.
The fix is to remove the call to forgetLoadedWallpaper() and allow the caching
mechanism to do its job.
Issue #
7986933 user switching on lock screen is slow (sometimes like molasses)
Change-Id: I447754ab85337bc8ae59b4ad6c3e6c2b30e13735
Alan Viverette [Tue, 30 Apr 2013 21:09:01 +0000 (14:09 -0700)]
am
a7fa0079: am
561dcc58: Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev
* commit '
a7fa0079a7bf544f7f7b0828c00a9247c0c51bfe':
Avoid crash when TextToSpeech calls onInit() from the constructor.
Alan Viverette [Tue, 30 Apr 2013 21:04:13 +0000 (14:04 -0700)]
am
561dcc58: Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev
* commit '
561dcc5823eec20c48d116531556b32e9de66f91':
Avoid crash when TextToSpeech calls onInit() from the constructor.
Dmitry Shmidt [Tue, 30 Apr 2013 20:59:10 +0000 (20:59 +0000)]
Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp"
sunil duttu [Wed, 6 Mar 2013 04:33:20 +0000 (10:03 +0530)]
framework:When turn off of SoftAp immediately call turning ON SoftAp
Due to sub system restart,There is state change of softAp tether state machine
in tethered state triggering turnoff SoftAp this should be
follwed by turnon softap.
Change-Id: I93051f17bcaae72ae0694f1f23557cc1d3bea280
Jeff Sharkey [Tue, 30 Apr 2013 20:33:18 +0000 (13:33 -0700)]
Better --unplugged support when dumping battery.
Also fixes logBatteryStatsLocked() to output valid dump data, instead
of just a usage message.
Bug:
8708665
Change-Id: Ie0d8d90e1a470b7e1e902643333309c2cf7bdb72
Elliott Hughes [Tue, 30 Apr 2013 20:23:17 +0000 (13:23 -0700)]
am
76c643c9: am
e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
* commit '
76c643c9b600ef31c22f807c2874c879a7fa5069':
when locale is non-Enligh, sometimes month spinner needs a number IME
Romain Guy [Tue, 30 Apr 2013 20:23:15 +0000 (13:23 -0700)]
am
55828af2: am
6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names."
* commit '
55828af26ce0090c6c80a300d27d1064ce1b74c6':
HeaderViewListAdapter: Correct thrown error names.
Elliott Hughes [Tue, 30 Apr 2013 20:21:22 +0000 (13:21 -0700)]
am
e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
* commit '
e3f2735fcfd8dafd226200d5cf219a6f82c9cc0c':
when locale is non-Enligh, sometimes month spinner needs a number IME
Romain Guy [Tue, 30 Apr 2013 20:21:19 +0000 (13:21 -0700)]
am
6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names."
* commit '
6628ee7a46a56cdc28d409e6fd74afc34bd24c5b':
HeaderViewListAdapter: Correct thrown error names.
Elliott Hughes [Tue, 30 Apr 2013 20:11:49 +0000 (20:11 +0000)]
Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
Elliott Hughes [Tue, 30 Apr 2013 19:17:27 +0000 (12:17 -0700)]
am
a99595a3: am
afe56810: Merge "Fix DatePicker\'s spinner order in various locales."
* commit '
a99595a393341b6a130e202bc9e93848ee53057b':
Fix DatePicker's spinner order in various locales.
Elliott Hughes [Tue, 30 Apr 2013 19:17:25 +0000 (12:17 -0700)]
am
c2639e58: am
0bb4c701: Merge "Use ICU for getDateFormatOrder."
* commit '
c2639e58fa5724c06a1d910ad76aebed647b4ba2':
Use ICU for getDateFormatOrder.
Elliott Hughes [Tue, 30 Apr 2013 19:15:06 +0000 (12:15 -0700)]
am
afe56810: Merge "Fix DatePicker\'s spinner order in various locales."
* commit '
afe56810517a4ddfad125029ca04fd4cc5af2ef5':
Fix DatePicker's spinner order in various locales.
Elliott Hughes [Tue, 30 Apr 2013 19:15:00 +0000 (12:15 -0700)]
am
0bb4c701: Merge "Use ICU for getDateFormatOrder."
* commit '
0bb4c701bab0f69172417b7a511acb6bdfa052db':
Use ICU for getDateFormatOrder.
Romain Guy [Tue, 30 Apr 2013 19:11:22 +0000 (19:11 +0000)]
Merge "HeaderViewListAdapter: Correct thrown error names."
Taylor H. Perkins [Tue, 30 Apr 2013 19:04:52 +0000 (12:04 -0700)]
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>
Romain Guy [Tue, 30 Apr 2013 18:58:17 +0000 (18:58 +0000)]
Merge "Handle Surface::lock errors in TextureView Bug #
8689535"
Elliott Hughes [Tue, 30 Apr 2013 18:40:01 +0000 (18:40 +0000)]
Merge "Fix DatePicker's spinner order in various locales."
Romain Guy [Tue, 30 Apr 2013 18:31:29 +0000 (18:31 +0000)]
Merge "Fix TextClock documentation Bug #
8670351"
Romain Guy [Tue, 30 Apr 2013 18:30:10 +0000 (11:30 -0700)]
Handle Surface::lock errors in TextureView
Bug #
8689535
Change-Id: I6d16e13903a58e93940160e7656147656ab79982
Elliott Hughes [Tue, 30 Apr 2013 18:22:18 +0000 (18:22 +0000)]
Merge "Use ICU for getDateFormatOrder."
Romain Guy [Tue, 30 Apr 2013 18:19:39 +0000 (11:19 -0700)]
Fix TextClock documentation
Bug #
8670351
Change-Id: I87a906b85b51f44d9dcecb6f137db53886323ad7
Romain Guy [Tue, 30 Apr 2013 18:12:26 +0000 (11:12 -0700)]
Prevent TextureView from ever setting a null layer paint
Bug #
8760436
DO NOT MERGE
Change-Id: I7e4d09fa534f539cb99ebeaa8159fb11920460cf
Elliott Hughes [Tue, 30 Apr 2013 18:11:53 +0000 (11:11 -0700)]
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
Elliott Hughes [Tue, 30 Apr 2013 18:09:53 +0000 (11:09 -0700)]
Use ICU for getDateFormatOrder.
Bug:
7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
Svetoslav [Tue, 30 Apr 2013 18:05:48 +0000 (18:05 +0000)]
Merge "Removing a debug check when logging fstrim events." into jb-mr2-dev
Svetoslav [Tue, 30 Apr 2013 17:43:56 +0000 (10:43 -0700)]
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
Svetoslav [Tue, 30 Apr 2013 17:41:21 +0000 (17:41 +0000)]
Merge "Perform idle maintenance when the device is charging." into jb-mr2-dev
Romain Guy [Tue, 30 Apr 2013 17:26:09 +0000 (17:26 +0000)]
Merge "Prevent TextureView from ever setting a null layer paint"
Romain Guy [Tue, 30 Apr 2013 17:25:35 +0000 (10:25 -0700)]
Prevent TextureView from ever setting a null layer paint
Change-Id: If9a418b7eb9969410286df43ee805cd7d8ec17b2
Svetoslav [Thu, 25 Apr 2013 21:45:54 +0000 (14:45 -0700)]
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
Kenny Root [Tue, 30 Apr 2013 16:01:38 +0000 (09:01 -0700)]
am
e9ae6822: resolved conflicts for merge of
1f6e789b to jb-mr2-dev-plus-aosp
* commit '
e9ae6822a80cb1f3bd13c785f1727c03d35da52e':
Track change to JSSE provider
John Reck [Tue, 30 Apr 2013 16:01:35 +0000 (09:01 -0700)]
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"
Kenny Root [Tue, 30 Apr 2013 16:00:14 +0000 (09:00 -0700)]
resolved conflicts for merge of
09ab7ef9 to master
Change-Id: I505317d0cde7a6daf0fd50b20cba21aa55693263
Irfan Sheriff [Tue, 30 Apr 2013 15:54:22 +0000 (08:54 -0700)]
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
Nick Kralevich [Tue, 30 Apr 2013 15:54:18 +0000 (08:54 -0700)]
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
Christopher Tate [Tue, 30 Apr 2013 15:54:13 +0000 (08:54 -0700)]
am
21675166: am
bd1730de: Merge "Document the \'aapt dump strings\' command"
* commit '
21675166345646f5bb278af487e69604290f09b0':
Kenny Root [Tue, 30 Apr 2013 15:54:02 +0000 (08:54 -0700)]
am
d334cb13: am
d152f7ec: Merge "Don\'t use X509CertImpl directly"
* commit '
d334cb13d694a4f1c6b885070ec48033366a4b37':
Kenny Root [Tue, 30 Apr 2013 15:45:12 +0000 (08:45 -0700)]
resolved conflicts for merge of
3424b817 to master
Change-Id: Idb5bb208aa6aca66744fe6988029d22e739cc67b
Zhentao Sun [Tue, 30 Apr 2013 15:31:46 +0000 (08:31 -0700)]
am
460778f1: am
906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev
* commit '
460778f10475bb9fa02cbfe8af7faef38807435c':
Fixed race conditions in GeofenceHardwareImpl.
Kenny Root [Tue, 30 Apr 2013 15:29:25 +0000 (08:29 -0700)]
resolved conflicts for merge of
ee4e9530 to master
Change-Id: I33931a962aff0ee8f6a04972afb0147e46b57baf
Baligh Uddin [Tue, 30 Apr 2013 14:56:13 +0000 (14:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 30 Apr 2013 14:54:26 +0000 (14:54 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Chet Haase [Tue, 30 Apr 2013 14:45:45 +0000 (14:45 +0000)]
Merge "Clarify behavior of fullscreen mode and softInputMode's adjustResize" into jb-mr2-dev
Kenny Root [Tue, 30 Apr 2013 06:09:03 +0000 (23:09 -0700)]
resolved conflicts for merge of
1f6e789b to jb-mr2-dev-plus-aosp
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
John Reck [Tue, 30 Apr 2013 05:53:57 +0000 (22:53 -0700)]
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"
Michael Wright [Tue, 30 Apr 2013 05:50:43 +0000 (22:50 -0700)]
resolved conflicts for merge of
b3f66877 to jb-mr2-dev-plus-aosp
Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d
Baligh Uddin [Tue, 30 Apr 2013 05:48:39 +0000 (22:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c5619a53271ddb3289ef2b6527274ef252e35e0
Auto-generated-cl: translation import
Baligh Uddin [Tue, 30 Apr 2013 05:34:34 +0000 (22:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I98754953f5b7d08dd0bac3510be1c5c082529b79
Auto-generated-cl: translation import
Baligh Uddin [Tue, 30 Apr 2013 05:25:03 +0000 (22:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic7fe032626cac3828e5b1eeaf9f4b4513a46b77a
Auto-generated-cl: translation import
Kenny Root [Tue, 30 Apr 2013 04:02:01 +0000 (04:02 +0000)]
Merge "Track change to JSSE provider"
Mike Lockwood [Tue, 30 Apr 2013 01:24:54 +0000 (01:24 +0000)]
Merge "Fix javadoc errors for @deprecated tags with no explanatory comment"
John Reck [Tue, 30 Apr 2013 01:21:30 +0000 (01:21 +0000)]
Merge "Revert "Can not mark the same content of browser page after copy""
Mike Lockwood [Tue, 30 Apr 2013 01:13:00 +0000 (18:13 -0700)]
Fix javadoc errors for @deprecated tags with no explanatory comment
Change-Id: I38a31facf7d4a9cd13645516f25b4305df65c618
Jeff Sharkey [Tue, 30 Apr 2013 01:18:30 +0000 (01:18 +0000)]
Merge "Add longpress support to keyevent."
John Reck [Tue, 30 Apr 2013 01:17:15 +0000 (01:17 +0000)]
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
Alan Viverette [Tue, 30 Apr 2013 01:11:08 +0000 (01:11 +0000)]
Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev
Mike Lockwood [Tue, 30 Apr 2013 00:00:00 +0000 (00:00 +0000)]
Merge "Remove obsolete OMA-DRM support"
Mike Lockwood [Mon, 29 Apr 2013 23:12:23 +0000 (16:12 -0700)]
Remove obsolete OMA-DRM support
Change-Id: Ic6008d4c9f8b9cd9fd4efec070260227af70559c
Chet Haase [Mon, 29 Apr 2013 23:04:40 +0000 (16:04 -0700)]
Clarify behavior of fullscreen mode and softInputMode's adjustResize
Fullscreen window's will not resize when the keyboard comes on screen,
regardless of the setting of the window's softInputMode field. This fix
clarifies the docs to make this behavior more obvious.
Issue #
8754615 Clarify behavior of adjustResize and fullscreen interaction
Change-Id: Ie056db4e328cefaf0edb54fe8cfa7a08f320c8d0
Jesse Hall [Mon, 29 Apr 2013 22:59:35 +0000 (15:59 -0700)]
Fix GLES30 JNI registration
Bug:
8657863
Change-Id: I498f32480863b0716b2a8dfce467143087573cce
Irfan Sheriff [Mon, 29 Apr 2013 23:01:55 +0000 (16:01 -0700)]
am
9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev
* commit '
9f844790f305338de4fa3adda5e125c811f280ca':
Remove scan notification dialog on wifi off
Irfan Sheriff [Mon, 29 Apr 2013 22:58:50 +0000 (22:58 +0000)]
Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev
Nick Kralevich [Mon, 29 Apr 2013 22:55:02 +0000 (15:55 -0700)]
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 '
7318b84054144c2461fd9392870691b394b44b89':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:53:04 +0000 (15:53 -0700)]
am
ec3396af: am
0412d9c7: am
4d17834a: am
b83e8b69: am
292c979a: am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
ec3396af9857bd50c6ccac692ecc12ab459239d2':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:50:14 +0000 (15:50 -0700)]
am
0412d9c7: am
4d17834a: am
b83e8b69: am
292c979a: am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
0412d9c7c7e5977e1ffbb3a28bba9f37807876a7':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:48:05 +0000 (15:48 -0700)]
am
4d17834a: am
b83e8b69: am
292c979a: am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
4d17834ab3d4850352f3d33742945dad61722cd5':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:46:21 +0000 (15:46 -0700)]
am
b83e8b69: am
292c979a: am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
b83e8b693b6738ba8e778d556ccdba629d372b52':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:44:43 +0000 (15:44 -0700)]
am
292c979a: am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
292c979a0f1e503422924421557b146cd28fc0d2':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:42:54 +0000 (15:42 -0700)]
am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
d440ca76029ab6f0909fdd9495941e04b90e5da7':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:41:36 +0000 (15:41 -0700)]
am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:38:40 +0000 (15:38 -0700)]
am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
6d8f5b755b133b308204b84145d773d401cdcd52':
libdrm: fix bad strncpy / snprintf calls