OSDN Git Service
Leon Scroggins III [Fri, 7 Mar 2014 18:26:19 +0000 (18:26 +0000)]
Merge "resolved conflicts for merge of
8d3281f5 to klp-dev-plus-aosp" into klp-dev-plus-aosp
Wink Saville [Fri, 7 Mar 2014 02:30:08 +0000 (02:30 +0000)]
am
16c0b295: am
bba3a694: Merge "Telephony API extension v2"
* commit '
16c0b295ef069e128a4e01fd2f72da06784950a1':
Telephony API extension v2
Nick Kralevich [Fri, 7 Mar 2014 02:29:42 +0000 (02:29 +0000)]
am
93994e9d: am
a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
93994e9db44a30402bd596764163d81ee1b1fd30':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Dave Platt [Fri, 7 Mar 2014 02:29:30 +0000 (02:29 +0000)]
am
53c7608a: am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
53c7608aefb0ed754394e571cac02e96ad6fcdb3':
Finish fixing Zygote descriptor leakage problem
Narayan Kamath [Fri, 7 Mar 2014 02:28:34 +0000 (02:28 +0000)]
Paul Duffin [Fri, 7 Mar 2014 02:27:47 +0000 (02:27 +0000)]
am
75d67c6a: am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
75d67c6aa051392e711fde3b901a4f2c62f983db':
Improve Parcel's handling of non-primitive arrays
Narayan Kamath [Fri, 7 Mar 2014 02:27:40 +0000 (02:27 +0000)]
am
aa98fb51: am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
aa98fb51a8a0148b72e1662cc42102c6547776ce':
Use size_t* in AssetManager::createIdmap
Dianne Hackborn [Fri, 7 Mar 2014 02:27:13 +0000 (02:27 +0000)]
am
133f6826: am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
133f6826e58aa7643858d4e50630103eb01f1815':
Runtime resource overlay, iteration 2, test cases
Dianne Hackborn [Fri, 7 Mar 2014 02:27:10 +0000 (02:27 +0000)]
am
4ad93639: am
67754d93: Merge "Runtime resource overlay, iteration 2"
* commit '
4ad93639d210297764db3ffcd870ff38464943de':
Runtime resource overlay, iteration 2
Dianne Hackborn [Fri, 7 Mar 2014 02:27:05 +0000 (02:27 +0000)]
am
0cd115e1: am
578087e3: Merge "New command line tool \'idmap\'"
* commit '
0cd115e1cebf4c090e7c36a65d4a5b7d1c363c21':
New command line tool 'idmap'
Narayan Kamath [Fri, 7 Mar 2014 02:26:56 +0000 (02:26 +0000)]
am
8a63c34b: am
3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"
* commit '
8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
Use long to store pointers in GLES_JNI/EGL classes
Narayan Kamath [Fri, 7 Mar 2014 02:26:53 +0000 (02:26 +0000)]
am
860bba68: am
7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
* commit '
860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
Fix in MediaMuxer's JNI code
Narayan Kamath [Fri, 7 Mar 2014 02:26:50 +0000 (02:26 +0000)]
am
5c770dfb: am
b823bd45: Merge "Use long to store pointers in ConsumerIrService"
* commit '
5c770dfba2846ee173d147fd974f8e9f073c1534':
Use long to store pointers in ConsumerIrService
Narayan Kamath [Fri, 7 Mar 2014 02:26:46 +0000 (02:26 +0000)]
am
b90fc64b: am
f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
* commit '
b90fc64b030ee50bda9a0dabb5247660b70d6659':
Use long for pointers in EmojiFactory and PdfDocument
Narayan Kamath [Fri, 7 Mar 2014 02:26:39 +0000 (02:26 +0000)]
am
5f7c0b1d: am
6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"
* commit '
5f7c0b1d80f883fa15f88e0e4d508576a36a45de':
Fix TinyHashMap to use generic hash_type instead of hash_t
Tim Murray [Fri, 7 Mar 2014 02:26:17 +0000 (02:26 +0000)]
am
eaf82374: am
38d799fc: Merge "Generic object based data copy."
* commit '
eaf82374186bd7084826f1cd258c82a3c6a4bf29':
Generic object based data copy.
Colin Cross [Fri, 7 Mar 2014 02:26:12 +0000 (02:26 +0000)]
am
12f1f5b8: am
40545f32: Merge "frameworks/base: fix errors inside ALOGV"
* commit '
12f1f5b87326a31f4c69e949a1e645e82c9152d4':
frameworks/base: fix errors inside ALOGV
Narayan Kamath [Fri, 7 Mar 2014 02:25:55 +0000 (02:25 +0000)]
am
578d4f5f: am
56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '
578d4f5f50b3b8969125376d696e893dc355faa6':
AArch64: Use long for pointers in RS Java/JNI code
Christopher Tate [Fri, 7 Mar 2014 02:25:26 +0000 (02:25 +0000)]
am
379bb6ed: am
ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '
379bb6ed4ea4de035569b04018f84d7ce95a8036':
Use canonical path for /vendor/app
John Spurlock [Fri, 7 Mar 2014 02:25:13 +0000 (02:25 +0000)]
am
6691bfd6: am
cccae25f: Merge "Example controller app for system ui demo mode."
* commit '
6691bfd6462e27af7075a3a46eccce943f0de9dd':
Example controller app for system ui demo mode.
Jean-Luc Brouillet [Fri, 7 Mar 2014 02:25:07 +0000 (02:25 +0000)]
Dan Sandler [Fri, 7 Mar 2014 02:25:00 +0000 (02:25 +0000)]
am
6b1f3acd: am
6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '
6b1f3acdf0f0806c0b3826d1c4ea43bd6cc6f021':
Make sure to turn off led after pulse()
Chris Craik [Fri, 7 Mar 2014 02:23:30 +0000 (02:23 +0000)]
am
0ec3ca6e: am
449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '
0ec3ca6e08e5933016beda147ca9a82e96434b15':
Fix for positioning of glyphs within a bitmap
Stephen Hines [Fri, 7 Mar 2014 02:23:01 +0000 (02:23 +0000)]
am
eadd6941: am
bc80e40b: Merge "Add message to RS docs about application vs. library packaging."
* commit '
eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
Add message to RS docs about application vs. library packaging.
Tim Murray [Fri, 7 Mar 2014 01:35:10 +0000 (01:35 +0000)]
am
6ceac9f0: (-s ours) am
f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit '
6ceac9f099b0ef7ca29351bbefa128df8101b5c2':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Fri, 7 Mar 2014 01:35:07 +0000 (01:35 +0000)]
am
b1bec0d9: am
3fb6feac: Merge "Check that bound allocations are 1D"
* commit '
b1bec0d916c00c7ceb09c691f1e5977909ba698d':
Check that bound allocations are 1D
Tim Murray [Fri, 7 Mar 2014 01:35:04 +0000 (01:35 +0000)]
am
67d9e0be: am
0cc37f4c: Merge "Fix debug context."
* commit '
67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb':
Fix debug context.
Tim Murray [Fri, 7 Mar 2014 01:35:01 +0000 (01:35 +0000)]
am
42e4aee5: am
0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '
42e4aee598d2eceab6fc20fc9801b5c2fbf2e50d':
Enable asynchronous destruction of BaseObjs.
Tim Murray [Fri, 7 Mar 2014 01:34:58 +0000 (01:34 +0000)]
am
42955bab: am
d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit '
42955bab2a275f3ea22d5a50b556cec88697a573':
Fix most logging macros for context pointers.
Tim Murray [Fri, 7 Mar 2014 01:34:55 +0000 (01:34 +0000)]
am
d39e19eb: am
351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '
d39e19eb8af54683d03ae955a5a58fea48a58754':
Fix getBytesSize for YUV allocations.
Tim Murray [Fri, 7 Mar 2014 01:34:52 +0000 (01:34 +0000)]
am
16e9362e: am
8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '
16e9362e5f5b4f09a46198218380bb386fee28e5':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Tim Murray [Fri, 7 Mar 2014 01:34:49 +0000 (01:34 +0000)]
am
8df3ea66: am
b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '
8df3ea66994e96d72040c44099dd2d74ba15ec67':
Convert Java/JNI to 64-bit, part 2.
Tim Murray [Fri, 7 Mar 2014 01:34:46 +0000 (01:34 +0000)]
am
72d637e2: am
e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '
72d637e297a143e5b18c8e8f4eb85695ed6b10f1':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Fri, 7 Mar 2014 01:34:43 +0000 (01:34 +0000)]
am
bccee732: am
61eb6b55: Merge "Use Object + type in place of specific array"
* commit '
bccee732b53d06c0e983b3f325e0d9ad889de134':
Use Object + type in place of specific array
Tim Murray [Fri, 7 Mar 2014 01:34:39 +0000 (01:34 +0000)]
am
69914882: am
e559d7ee: Merge "Utility API for creating types."
* commit '
69914882509b8ad81c23eadd1ebae53fb532042b':
Utility API for creating types.
Tim Murray [Fri, 7 Mar 2014 01:34:36 +0000 (01:34 +0000)]
am
271c3b74: am
b1c1518e: Merge "Remove old hidden API."
* commit '
271c3b7499f53f6e7e168d68910efda5cc19f5fd':
Remove old hidden API.
Tim Murray [Fri, 7 Mar 2014 01:34:33 +0000 (01:34 +0000)]
am
9bad32c3: am
aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '
9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
Remove hidden API setSurfaceTexture.
Kenny Root [Fri, 7 Mar 2014 01:33:25 +0000 (01:33 +0000)]
am
85ee57d1: am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
85ee57d1ae73db6ac014d76d7be1b5d5e87eb89f':
Remove DRLCertFactory
Leon Scroggins III [Fri, 7 Mar 2014 01:06:08 +0000 (20:06 -0500)]
resolved conflicts for merge of
8d3281f5 to klp-dev-plus-aosp
Change-Id: If2855ff4f7a1e7645c69af378955868f44187376
Narayan Kamath [Fri, 7 Mar 2014 00:38:00 +0000 (00:38 +0000)]
am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 7 Mar 2014 00:37:56 +0000 (00:37 +0000)]
am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
Change ResourceType cookies to int32_t.
Narayan Kamath [Fri, 7 Mar 2014 00:37:53 +0000 (00:37 +0000)]
am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
149510e010b46a445355a8d7fcdb8401125b92c3':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 7 Mar 2014 00:37:49 +0000 (00:37 +0000)]
am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
4463a4ef26b2eb62fae74568193fd07e97dedd4d':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Zhijun He [Fri, 7 Mar 2014 00:37:35 +0000 (00:37 +0000)]
am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
5901ddeb525ed7691c382e8d17f47055d7d1e5db':
Release locked buffer when it fails to acquire graphics buffer
Brian Carlstrom [Fri, 7 Mar 2014 00:37:27 +0000 (00:37 +0000)]
am
2cd0563c: am
3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
2cd0563cb8345747d3705d4f339a0800998767fe':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Narayan Kamath [Thu, 6 Mar 2014 22:58:13 +0000 (22:58 +0000)]
am
70986e19: am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
70986e197bbaf4de4f8126519a75df2b057c3b52':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Thu, 6 Mar 2014 22:58:08 +0000 (22:58 +0000)]
am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
fa2e16e36d95d5cf0848a28a98ac4566321fc119':
change Surface constructor arg to 64bit
Brian Carlstrom [Thu, 6 Mar 2014 21:57:33 +0000 (13:57 -0800)]
resolved conflicts for merge of
cb7cdd50 to klp-dev-plus-aosp
Change-Id: Iba01a6617d4922ec2827b0465095695028c20681
Eric Laurent [Thu, 6 Mar 2014 20:05:33 +0000 (20:05 +0000)]
am
eac19754: am
617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit '
eac19754ca0822e4c1c50c436affbf5cbf7e08d3':
Fix RemoteController synchronization mode
Dianne Hackborn [Thu, 6 Mar 2014 20:05:29 +0000 (20:05 +0000)]
am
12caef78: am
71ab245a: Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
* commit '
12caef7836a21fa20d052e4868df92e23b930cf6':
Fix issue #
11536426 DO NOT MERGE
Santos Cordon [Thu, 6 Mar 2014 20:05:23 +0000 (20:05 +0000)]
am
abbd963e: am
4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit '
abbd963e3c50f5241f9bf668b8b806c42a202621':
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
Leon Scroggins III [Thu, 6 Mar 2014 19:49:58 +0000 (19:49 +0000)]
am
ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
* commit '
ee008d4264a95bba5f90b17856fc06fa29a6f12c':
Update framework to use M33 Skia. DO NOT MERGE
Eric Laurent [Thu, 6 Mar 2014 19:49:55 +0000 (19:49 +0000)]
am
617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit '
617e715a40e2867c0b30d1bae38c20815ee30071':
Fix RemoteController synchronization mode
Dianne Hackborn [Thu, 6 Mar 2014 19:49:52 +0000 (19:49 +0000)]
am
71ab245a: Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
* commit '
71ab245a0d7830791cb89ec9130313620a1ee029':
Fix issue #
11536426 DO NOT MERGE
Santos Cordon [Thu, 6 Mar 2014 19:49:46 +0000 (19:49 +0000)]
am
4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit '
4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
Leon Scroggins III [Thu, 6 Mar 2014 19:37:28 +0000 (19:37 +0000)]
Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
Eric Laurent [Thu, 6 Mar 2014 19:21:26 +0000 (19:21 +0000)]
Merge "Fix RemoteController synchronization mode" into klp-dev
Nick Kralevich [Thu, 6 Mar 2014 18:38:51 +0000 (18:38 +0000)]
am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
3dfa15c49b4c78cdf3bf1af79e9b307596455708':
Map SELinux log levels to Android log levels.
Dianne Hackborn [Thu, 6 Mar 2014 18:29:19 +0000 (18:29 +0000)]
Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
Dianne Hackborn [Mon, 2 Dec 2013 18:04:42 +0000 (10:04 -0800)]
Fix issue #
11536426 DO NOT MERGE
Permission denied when trying to launch an activity from a notification
We don't remove pending intents when updating an app, which is necessary
to keep app widgets and other things working. However, when uninstalling
an app, we should clear out all of its pending intents.
Change-Id: I95067b31098115b5a7b127766fd093750063bbb8
Baligh Uddin [Thu, 6 Mar 2014 17:57:01 +0000 (17:57 +0000)]
am
d010cf12: (-s ours) am
221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
d010cf12c796cf83c760df037916e5572ce55868':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 6 Mar 2014 17:41:09 +0000 (17:41 +0000)]
am
221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
221849b6d68704340754200492329f19cef7979b':
Import translations. DO NOT MERGE
Santos Cordon [Tue, 4 Mar 2014 00:06:54 +0000 (16:06 -0800)]
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
bug:
12175514
Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
(cherry picked from commit
b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)
Jean-Michel Trivi [Thu, 2 Jan 2014 23:08:26 +0000 (15:08 -0800)]
Fix RemoteController synchronization mode
Fix erroneous argument check in RemoteController syncrhonization
mode setter..
Bug
12189375
Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10
Leon Scroggins III [Tue, 3 Dec 2013 21:26:51 +0000 (16:26 -0500)]
Update framework to use M33 Skia. DO NOT MERGE
(These CLs are already in master.)
Bug:
13246311
This cherry-picks 7 CLs:
-----------------------------------------------------------------------
Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.
Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.
cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
-----------------------------------------------------------------------
Merge AssetStream with AssetStreamAdaptor.
Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.
The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
the length (read(NULL, 0)) is no longer implemented, since it is
no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
so some implementation is necessary.
cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56
-----------------------------------------------------------------------
Deprecate Android-specific SkPaint functions.
The following functions were problematic:
const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
const void* findImage(const SkGlyph&, const SkMatrix*);
Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.
Bug:
11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08
-----------------------------------------------------------------------
pass SkGlyphCache into updateGlyphCache()
Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.
Bug:
11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89
-----------------------------------------------------------------------
Updates to the Skia API needed to merge the WebView m33 version of Skia.
cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3
Bugfix for screenshots (recent apps) due to incorrect rowBytes computation
bug:
12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714
-----------------------------------------------------------------------
Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.
cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5
-----------------------------------------------------------------------
Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
Baligh Uddin [Thu, 6 Mar 2014 17:00:46 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Santos Cordon [Thu, 6 Mar 2014 02:14:46 +0000 (02:14 +0000)]
am
a45bb4be: am
77a60f00: Merge "Update permission description string." into klp-dev
* commit '
a45bb4be2f12144754aa62a5d44c39db08b21c92':
Update permission description string.
Santos Cordon [Thu, 6 Mar 2014 01:56:50 +0000 (01:56 +0000)]
am
77a60f00: Merge "Update permission description string." into klp-dev
* commit '
77a60f006f8b7260207043529d3ed004db301bd5':
Update permission description string.
Santos Cordon [Thu, 6 Mar 2014 01:54:20 +0000 (01:54 +0000)]
Merge "Update permission description string." into klp-dev
Michael Wright [Thu, 6 Mar 2014 00:56:59 +0000 (00:56 +0000)]
am
4448f9d7: am
c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit '
4448f9d7ade3d08a29b1a191e182a403c5584388':
Revert Japanese special case fallback keys.
Michael Wright [Thu, 6 Mar 2014 00:53:22 +0000 (00:53 +0000)]
am
c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit '
c5dea68e9856698953dafca868eaee7207614641':
Revert Japanese special case fallback keys.
Michael Wright [Thu, 6 Mar 2014 00:50:15 +0000 (00:50 +0000)]
Merge "Revert Japanese special case fallback keys." into klp-dev
Fabrice Di Meglio [Thu, 6 Mar 2014 00:35:40 +0000 (00:35 +0000)]
am
57f8a4b4: am
1ff2df61: Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '
57f8a4b4ed48ae3e2488bb3bafcd40137c71ec18':
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
Fabrice Di Meglio [Thu, 6 Mar 2014 00:35:36 +0000 (00:35 +0000)]
am
cb6dcd7a: am
2b58a29f: Merge "Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit '
cb6dcd7af2d015b7a3d49f1224936241747bcb43':
Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
Fabrice Di Meglio [Thu, 6 Mar 2014 00:32:30 +0000 (00:32 +0000)]
am
1ff2df61: Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '
1ff2df6194148f487ccb014a7c5302fa8ffe2571':
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
Fabrice Di Meglio [Thu, 6 Mar 2014 00:32:27 +0000 (00:32 +0000)]
am
2b58a29f: Merge "Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit '
2b58a29f825e6442d8767a36adaf1770b86d5725':
Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:34 +0000 (00:29 +0000)]
Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
Fabrice Di Meglio [Thu, 6 Mar 2014 00:29:20 +0000 (00:29 +0000)]
Merge "Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
Dirk Dougherty [Mon, 3 Mar 2014 22:05:21 +0000 (14:05 -0800)]
Update permission description string.
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit
08d7c2861fee205a314c3847ab5f5894617a233b)
Dianne Hackborn [Wed, 5 Mar 2014 23:11:07 +0000 (23:11 +0000)]
am
5e578e17: am
40a26004: Issue #
13308712: Add --checkin to package manager dump.
* commit '
5e578e17f4392d1baf41772ab45347bc8bcccc38':
Issue #
13308712: Add --checkin to package manager dump.
Dianne Hackborn [Wed, 5 Mar 2014 23:07:45 +0000 (23:07 +0000)]
am
40a26004: Issue #
13308712: Add --checkin to package manager dump.
* commit '
40a26004810623f02546a31cb0ce49a0502bdff7':
Issue #
13308712: Add --checkin to package manager dump.
Dianne Hackborn [Fri, 17 Jan 2014 21:29:21 +0000 (13:29 -0800)]
Issue #
13308712: Add --checkin to package manager dump.
Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233
Fabrice Di Meglio [Tue, 10 Dec 2013 00:40:14 +0000 (16:40 -0800)]
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)
Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783
Fabrice Di Meglio [Tue, 7 Jan 2014 00:30:43 +0000 (16:30 -0800)]
Fix bug #
12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
- force TextView internal layout recreation when its TextDirection is changed
Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
(cherry picked from commit
22228fec05129af9684f95d7a13aeff92144bd90)
Robert Greenwalt [Wed, 5 Mar 2014 18:31:18 +0000 (18:31 +0000)]
am
bad3a9e6: am
2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit '
bad3a9e66fb103ec96ea89ce9eff7270333d5926':
Only apply tcp buffer sizes for default net
Robert Greenwalt [Wed, 5 Mar 2014 18:27:03 +0000 (18:27 +0000)]
am
2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit '
2d1e8c49582fb91df0a05a778c228fc1cd89e026':
Only apply tcp buffer sizes for default net
Robert Greenwalt [Wed, 5 Mar 2014 18:23:56 +0000 (18:23 +0000)]
Merge "Only apply tcp buffer sizes for default net" into klp-dev
Baligh Uddin [Wed, 5 Mar 2014 17:58:27 +0000 (09:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
Auto-generated-cl: translation import
Christopher Tate [Wed, 5 Mar 2014 00:57:22 +0000 (00:57 +0000)]
am
1efc6e52: am
1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
* commit '
1efc6e52d65389463ad52c32df02d68493df0f48':
Adapt to underlying changes in the PBKDF2 implementation
Christopher Tate [Wed, 5 Mar 2014 00:57:18 +0000 (00:57 +0000)]
am
f63ae644: am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 00:54:17 +0000 (00:54 +0000)]
am
1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
* commit '
1d13f13deac644bddbae8a1f92642074a32d7a6c':
Adapt to underlying changes in the PBKDF2 implementation
Christopher Tate [Wed, 5 Mar 2014 00:54:14 +0000 (00:54 +0000)]
am
1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
* commit '
1e995c76485f8a7477177886890b834c31e8d1a6':
Update PackageMonitor to recognize new 'replacing' semantics
Christopher Tate [Wed, 5 Mar 2014 00:51:32 +0000 (00:51 +0000)]
Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
Christopher Tate [Wed, 5 Mar 2014 00:51:04 +0000 (00:51 +0000)]
Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev
John Spurlock [Tue, 4 Mar 2014 19:15:56 +0000 (19:15 +0000)]
am
38f81ccc: am
fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '
38f81ccc768958b1a9100cb2caa93ec3aedd9b5e':
Volume panel should not clear system ui flags.
John Spurlock [Tue, 4 Mar 2014 19:15:53 +0000 (19:15 +0000)]
am
49eac16e: am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
49eac16ec00ea63feaafc137a1d313fcb4374b36':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 19:15:49 +0000 (19:15 +0000)]
am
2cc271eb: am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
2cc271ebbccc251ef96edee16b79a22fcf856244':
Allow lights-out + bar icon dimming on low-end devices.
John Spurlock [Tue, 4 Mar 2014 19:12:40 +0000 (19:12 +0000)]
am
fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '
fee6f69e8321c3f94c2b341fe483f7b1f6534169':
Volume panel should not clear system ui flags.
John Spurlock [Tue, 4 Mar 2014 19:12:37 +0000 (19:12 +0000)]
am
8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '
8ec59a72889f7da0c13119977ca62ada8a1498e0':
Show hideycling for non-primary users.
John Spurlock [Tue, 4 Mar 2014 19:12:33 +0000 (19:12 +0000)]
am
d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev
* commit '
d36ede391619e6fc8a1553f5b2f4b33b3603cd65':
Allow lights-out + bar icon dimming on low-end devices.