OSDN Git Service
Geoff Mendal [Wed, 11 Nov 2015 18:03:38 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
efa66ca345 -s ours
* commit '
efa66ca345bc9c82e9f4c88e4e902f935804ab73':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:56:56 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 11 Nov 2015 17:41:18 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE am:
984f7fb960 -s ours
am:
adaccf62be -s ours
* commit '
adaccf62be5c8b1f44f5dd0c03bff01a2b314896':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:41:18 +0000 (18:41 +0100)]
Import translations. DO NOT MERGE
Change-Id: If1583a01724c6eb81c234b7f2b71c7f276d67a13
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Nov 2015 17:32:10 +0000 (17:32 +0000)]
Import translations. DO NOT MERGE
am:
984f7fb960 -s ours
* commit '
984f7fb9603b55d3031f7df04fa37010513b712c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:07:16 +0000 (18:07 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ief45ae89cfe3bfd76390f8f70276c2411d0dfc30
Auto-generated-cl: translation import
Sebastien Hertz [Wed, 11 Nov 2015 01:11:33 +0000 (01:11 +0000)]
Allow debugging only for apps forked from zygote am:
f915991842 -s ours
am:
48fdfa403e
* commit '
48fdfa403eef469ea9bbcbf5509d919b7db447c7':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Wed, 11 Nov 2015 01:02:21 +0000 (01:02 +0000)]
Allow debugging only for apps forked from zygote
am:
f915991842 -s ours
* commit '
f91599184200e4e5f5b8bb01f9e7274d21a3dc9d':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.
Bug:
23050463
(cherry picked from commit
7a09b8322cab26d6e3da1362d3c74964ae66b5d4)
Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
(cherry picked from commit
ff8dc21278b19b22ed8dc9f9475850838336d351)
Jeff Sharkey [Mon, 9 Nov 2015 21:53:02 +0000 (21:53 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev am:
00765ef5a2
am:
e6538dcc06
* commit '
e6538dcc06c2547ac8a58c265e6b586fc9652ef3':
Block directory selection in openable modes.
Jeff Sharkey [Mon, 9 Nov 2015 21:46:06 +0000 (21:46 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev
am:
00765ef5a2
* commit '
00765ef5a2a0981d18a15f3acaf4119592d42996':
Block directory selection in openable modes.
Jeff Sharkey [Mon, 9 Nov 2015 21:40:29 +0000 (21:40 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev
Marco Nelissen [Mon, 9 Nov 2015 21:34:14 +0000 (21:34 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am:
83702ec3ed
am:
02bf433f90
* commit '
02bf433f902aa34483aa2fc1b410f393b35058f1':
Fix race condition when setting default ringtones
Marco Nelissen [Mon, 9 Nov 2015 21:28:32 +0000 (21:28 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
am:
83702ec3ed
* commit '
83702ec3edf3bd17eff90a409cc3cf5efab48cff':
Fix race condition when setting default ringtones
Marco Nelissen [Mon, 9 Nov 2015 21:21:55 +0000 (21:21 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
Geoff Mendal [Mon, 9 Nov 2015 17:57:11 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
f3b3a2ce2b -s ours
* commit '
f3b3a2ce2bc9b3f5eb6c96b7a828d245c84cc203':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:51:40 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 9 Nov 2015 17:43:57 +0000 (18:43 +0100)]
Import translations. DO NOT MERGE
Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 17:34:42 +0000 (17:34 +0000)]
Import translations. DO NOT MERGE am:
49eeda33dd -s ours
am:
0414438abe -s ours
* commit '
0414438abe0718f5007d7b580981d6ba204b655c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:27:25 +0000 (17:27 +0000)]
Import translations. DO NOT MERGE
am:
49eeda33dd -s ours
* commit '
49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:10:12 +0000 (18:10 +0100)]
Import translations. DO NOT MERGE
Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 13:29:12 +0000 (13:29 +0000)]
Import translations. DO NOT MERGE
am:
210f0afaf9 -s ours
* commit '
210f0afaf9011d044d261f1044a1a7368cb89e7e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 13:11:08 +0000 (05:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
Marco Nelissen [Fri, 6 Nov 2015 00:44:52 +0000 (16:44 -0800)]
Fix race condition when setting default ringtones
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.
Bug:
18625739
Bug:
22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
Chris Elliott [Fri, 6 Nov 2015 18:41:35 +0000 (18:41 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am:
d9a2be8d3d -s ours
am:
634221adb2
* commit '
634221adb28f765233889cca32078e4b042198f3':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 18:36:16 +0000 (18:36 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
am:
d9a2be8d3d -s ours
* commit '
d9a2be8d3d5bd0e170fec71c316373e268a8c17f':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 17:41:17 +0000 (17:41 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
This reverts commit
7e19e286cc990daaafe934ed82ddfa00762907d6.
Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a
Jeff Sharkey [Fri, 6 Nov 2015 17:16:22 +0000 (09:16 -0800)]
Block directory selection in openable modes.
When picking documents to return to apps requesting CATEGORY_OPENABLE
we can't let the user select directories.
Bug:
25455200
Change-Id: I8076883ee5b019eab4d2adb841952865f21e413e
Chris Craik [Thu, 5 Nov 2015 20:31:39 +0000 (20:31 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am:
0cf48e9120
am:
17fc83cbde
* commit '
17fc83cbde8ab1e92664d12a0fed306e9054ca55':
Revert "Remove -ffast-math from libhwui makefile"
Jeff Sharkey [Thu, 5 Nov 2015 20:30:12 +0000 (20:30 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am:
e10faaa410
am:
2de7e39ffa
* commit '
2de7e39ffa387b370e5997542811fd05a73cb8fc':
Kick movement preconditions onto handler thread.
Chris Craik [Thu, 5 Nov 2015 20:25:34 +0000 (20:25 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev
am:
0cf48e9120
* commit '
0cf48e9120fee8e5f0abc7b50a816bb2bc8e6127':
Revert "Remove -ffast-math from libhwui makefile"
Jeff Sharkey [Thu, 5 Nov 2015 20:23:46 +0000 (20:23 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev
am:
e10faaa410
* commit '
e10faaa41026863b9d0f7dd6b0c239ff79586dc7':
Kick movement preconditions onto handler thread.
Chris Craik [Thu, 5 Nov 2015 20:21:45 +0000 (20:21 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev
Tenghui Zhu [Thu, 5 Nov 2015 20:20:29 +0000 (20:20 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am:
76d20b4a5c
am:
1c7fbe0efb
* commit '
1c7fbe0efbabe5c15ba72e16053551a8fdae1b92':
When the incoming light source is invalid, don't generate any shadow
Jeff Sharkey [Thu, 5 Nov 2015 20:17:13 +0000 (20:17 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev
Tenghui Zhu [Thu, 5 Nov 2015 20:13:05 +0000 (20:13 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev
am:
76d20b4a5c
* commit '
76d20b4a5c6463235d9497b8018a38c059a6761c':
When the incoming light source is invalid, don't generate any shadow
Joe LaPenna [Thu, 5 Nov 2015 20:09:17 +0000 (20:09 +0000)]
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
am:
88c7c3e080 -s ours
* commit '
88c7c3e08051f4a2be8ee5194214678a07ff7f01':
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
Tenghui Zhu [Thu, 5 Nov 2015 20:05:37 +0000 (20:05 +0000)]
Merge "When the incoming light source is invalid, don't generate any shadow" into mnc-dr-dev
Joe LaPenna [Thu, 5 Nov 2015 19:26:47 +0000 (11:26 -0800)]
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
Also remove DEBUG-related timeout changes to have consistent behavior.
BUG:
24247417
BUG:
25463669
BUG:
23753686
Change-Id: Icfbb1531173477f2649f7f99e3bef9860e5a9ec2
Jeff Sharkey [Thu, 5 Nov 2015 18:00:05 +0000 (10:00 -0800)]
Kick movement preconditions onto handler thread.
The bulk of package moving already occurs on the handler thread,
but one of the precondition steps requires that we make an installd
call to calculate disk space of the app. If there was already
another long-running installd call going on, we could end up ANR'ing
the caller.
Since movePackage() is already designed to return a moveId and go
async, we can push all the precondition steps onto the handler thread
to prevent the ANR.
Bug:
25490003
Change-Id: I62d555c23bbf81b791f6f4cabc40c3d64c580cf8
Chris Craik [Thu, 5 Nov 2015 17:58:28 +0000 (17:58 +0000)]
Revert "Remove -ffast-math from libhwui makefile"
This reverts commit
e02ec7c37a92fd63748a610bac6a23d0409788cf.
Change-Id: Iea7fadf04c4ffa62be28f783342ae749f89bf931
Deepanshu Gupta [Thu, 5 Nov 2015 17:21:16 +0000 (17:21 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
Deepanshu Gupta [Thu, 5 Nov 2015 01:49:16 +0000 (17:49 -0800)]
Fix Switch colors
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.
Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
Teng-Hui Zhu [Thu, 5 Nov 2015 00:57:53 +0000 (16:57 -0800)]
When the incoming light source is invalid, don't generate any shadow
b/
25417885
Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
Riley Andrews [Wed, 4 Nov 2015 20:30:48 +0000 (20:30 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d
am:
2c740f1dcf
* commit '
2c740f1dcf7bfd75a1dde2f7403cb25ae6559556':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:24:36 +0000 (20:24 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
am:
c8bb39d98d
* commit '
c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:18:35 +0000 (20:18 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 19:40:02 +0000 (19:40 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b
am:
8b581e2bc7
* commit '
8b581e2bc797d3b470ad7ff3d362a998b42da4ea':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
am:
10eb6ab94b
* commit '
10eb6ab94b932c33a708e007b0681b26930260e3':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8
am:
62b16e2e10
* commit '
62b16e2e10e488eb69ae0d11d43c7693ad809ec2':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:28:39 +0000 (19:28 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 19:27:19 +0000 (19:27 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
am:
c4aaf0f4b8
* commit '
c4aaf0f4b853e7df1eaffc350618e07474d0bad1':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:20:52 +0000 (19:20 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
Teng-Hui Zhu [Thu, 1 Oct 2015 23:49:16 +0000 (16:49 -0700)]
Early return when the scale is 0.
b/
24534579
Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit
8d0ec389531d071529fb0a800f10733b057205d9)
Chris Craik [Wed, 4 Nov 2015 18:12:28 +0000 (10:12 -0800)]
Remove -ffast-math from libhwui makefile
bug:
25417885
Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a
Geoff Mendal [Wed, 4 Nov 2015 18:12:19 +0000 (18:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours
am:
cbe037b01a -s ours
* commit '
cbe037b01ab25dfbab1cb6ea0fa137787e747ab7':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:11:21 +0000 (18:11 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
John Reck [Wed, 4 Nov 2015 18:10:52 +0000 (18:10 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b
am:
f8635c2e04
* commit '
f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
John Reck [Wed, 4 Nov 2015 18:09:49 +0000 (18:09 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b
am:
f8635c2e04
* commit '
f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 18:08:13 +0000 (18:08 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours
am:
d4d6fdefdf -s ours
* commit '
d4d6fdefdf83018e46e8de56f0e1679954bb398a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 18:00:48 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
8e7ab07ce7 -s ours
* commit '
8e7ab07ce76c20da653e098adfe38da867753305':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 17:59:15 +0000 (17:59 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
am:
1e1fbd804b
* commit '
1e1fbd804b71419736eac4bf537f0a454687b209':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 17:57:51 +0000 (17:57 +0000)]
Import translations. DO NOT MERGE
am:
4c9cdbc7ba -s ours
* commit '
4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 4 Nov 2015 17:40:21 +0000 (11:40 -0600)]
Import translations. DO NOT MERGE
Change-Id: Icad182fa5b410d93f43fcba49a0d07cefed7970c
Auto-generated-cl: translation import
John Reck [Wed, 4 Nov 2015 16:24:02 +0000 (16:24 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
John Reck [Wed, 4 Nov 2015 15:21:35 +0000 (15:21 +0000)]
Revert "Use clang for libhwui"
Bug
25462107
This reverts commit
d354fd2c66855d116440eb4c936317f124241225.
Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
Geoff Mendal [Wed, 4 Nov 2015 14:59:32 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import
Diego Perez [Wed, 4 Nov 2015 14:26:15 +0000 (14:26 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:25:58 +0000 (14:25 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
Geoff Mendal [Wed, 4 Nov 2015 14:09:51 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
931082b728 -s ours
* commit '
931082b728a42e0b22b163721d7d48faf23d45a4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:08:19 +0000 (14:08 +0000)]
Import translations. DO NOT MERGE
am:
f44adbba69 -s ours
* commit '
f44adbba69c22e4c9cd681bbb3cab70097eae118':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 13:38:21 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 4 Nov 2015 13:20:46 +0000 (07:20 -0600)]
Import translations. DO NOT MERGE
Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:09:10 +0000 (05:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I52024255e1324f3757497603d692def1fec6e75f
Auto-generated-cl: translation import
Diego Perez [Wed, 4 Nov 2015 11:35:34 +0000 (11:35 +0000)]
Update StaticLayout_Delegate to use new nLoadHyphenator
Small fix to update call parameters
Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
Riley Andrews [Wed, 4 Nov 2015 07:36:52 +0000 (23:36 -0800)]
Convert ashmem bitmap thresholds to constants.
Bug
25256717
Change-Id: I23e2795ef8798d83bf60dcbd6ff2e7093fcaa9b0
Signed-off-by: Riley Andrews <riandrews@google.com>
Daniel Koulomzin [Wed, 4 Nov 2015 00:02:32 +0000 (00:02 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am:
7e19e286cc -s ours
am:
6e0a83bcd9
* commit '
6e0a83bcd97574451e83d58ac646af9daf3216be':
ActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Tue, 3 Nov 2015 23:51:39 +0000 (23:51 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE
am:
7e19e286cc -s ours
* commit '
7e19e286cc990daaafe934ed82ddfa00762907d6':
ActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Thu, 24 Sep 2015 18:38:17 +0000 (14:38 -0400)]
ActivityView gets its own thread pool. DO NOT MERGE
Bug:
24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
Ian Pedowitz [Tue, 3 Nov 2015 22:13:54 +0000 (22:13 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am:
966d6040c6
am:
95fc53b029
* commit '
95fc53b0293a6361c7ff8a412897a869f07664c6':
Limit persistent ashmem backed fds to a minimum of 128kB.
Ian Pedowitz [Tue, 3 Nov 2015 22:05:23 +0000 (22:05 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
am:
966d6040c6
* commit '
966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
Limit persistent ashmem backed fds to a minimum of 128kB.
Ian Pedowitz [Tue, 3 Nov 2015 21:58:30 +0000 (21:58 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
Tenghui Zhu [Tue, 3 Nov 2015 19:49:20 +0000 (19:49 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev am:
61c93eb16d
am:
a66dc6e159
* commit '
a66dc6e159bd8f4997a9253d5590807c02358d84':
Use clang for libhwui
Tenghui Zhu [Tue, 3 Nov 2015 19:40:29 +0000 (19:40 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
am:
61c93eb16d
* commit '
61c93eb16d91bd210948af6e812517e3c03535b4':
Use clang for libhwui
Tenghui Zhu [Tue, 3 Nov 2015 19:25:43 +0000 (19:25 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
Ching Tzung Lin [Tue, 3 Nov 2015 19:03:48 +0000 (19:03 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
am:
7f54aa1e81
* commit '
7f54aa1e814527371d54864bcbf9387553822ea7':
Remove circular_display_mask_offset symbol and default
Ching Tzung Lin [Tue, 3 Nov 2015 18:39:40 +0000 (18:39 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
Chris Craik [Tue, 3 Nov 2015 18:33:34 +0000 (10:33 -0800)]
Use clang for libhwui
bug:
25417885
Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156
Dianne Hackborn [Tue, 3 Nov 2015 18:33:57 +0000 (18:33 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am:
71e4984505
am:
9a13cc6992
* commit '
9a13cc69926c90fe75b624a9a781dc56706a6091':
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Tue, 3 Nov 2015 18:27:18 +0000 (18:27 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
am:
71e4984505
* commit '
71e49845054a3a7dacc51efc4fe658818caec048':
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Tue, 3 Nov 2015 18:21:23 +0000 (18:21 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
Riley Andrews [Mon, 2 Nov 2015 07:36:04 +0000 (23:36 -0800)]
Limit persistent ashmem backed fds to a minimum of 128kB.
Bug
25256717
Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
Diego Perez [Tue, 3 Nov 2015 14:59:23 +0000 (14:59 +0000)]
Remove auto-boxing during the inflate
Change-Id: I3f9ba5d78363f878fa0c58ca8cbf736bd43fe1c0
Thierry Strudel [Tue, 3 Nov 2015 06:45:12 +0000 (06:45 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am:
1942be506e
am:
b1fe11fde4
* commit '
b1fe11fde44b4ac56c48f91cd27ced7ac4b0469f':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:39:58 +0000 (06:39 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
am:
1942be506e
* commit '
1942be506eb16589e3059fa62ea7b718440fb386':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:35:59 +0000 (06:35 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
Tyler Gunn [Tue, 3 Nov 2015 04:54:47 +0000 (04:54 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am:
8b86c76296
am:
48a0c3ae8d
* commit '
48a0c3ae8dd0d3944a3cffa2bafec47f9bc346d6':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:49:33 +0000 (04:49 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
am:
8b86c76296
* commit '
8b86c7629676eeea490531b2a412873e0196eb6f':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:44:53 +0000 (04:44 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
OSDN Git Service
