Shubham Ajmera
b0886738b6
Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
...
am: 94adc6c
* commit '94adc6ce96c4405134141e4e7a7ff8512e2dda1b':
Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7
Change-Id: Ie844dfe438d37abd1f708b149be51a611b7e7044
2016-04-25 09:39:31 +00:00
Neil Fuller
94adc6ce96
Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
2016-04-25 09:31:40 +00:00
Tobias Thierer
71502c44fa
Merge "Avoid instantiations of Boolean that are immediately unboxed."
...
am: 823e05b
* commit '823e05b2db229549c33892a0aa303fd7fb10a214':
Avoid instantiations of Boolean that are immediately unboxed.
Change-Id: I170bf470d63faec93c228ae897796a2e6067da7e
2016-04-25 09:14:15 +00:00
Tobias Thierer
823e05b2db
Merge "Avoid instantiations of Boolean that are immediately unboxed."
2016-04-25 09:08:44 +00:00
Shubham Ajmera
f9446f77a2
Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7
...
Bug: 27426743
(cherry picked from commit 6c69351469 )
Change-Id: I7276e39951d721704726132281c316c77bdab515
2016-04-22 17:10:45 +01:00
Tobias Thierer
9d1357c44e
Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)."
...
am: 1b33b45038
* commit '1b33b450381855a6403a577a2613093c578d6754':
Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL).
Change-Id: If82fea1bcf30adf8412becbb13aa599837d00a57
2016-04-22 14:54:48 +00:00
Tobias Thierer
1b33b45038
Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)."
2016-04-22 14:43:52 +00:00
Tobias Thierer
ca01820735
Avoid instantiations of Boolean that are immediately unboxed.
...
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).
Also fixed a couple of other valueOf()s in SyncStorageEngine.
Bug: 28289401
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
2016-04-22 14:21:12 +01:00
Tobias Thierer
8e9bd59555
Merge "frameworks/base: Avoid Long object allocations in Long.valueOf()"
...
am: 09ae4931a9
* commit '09ae4931a98cb0cb7edac257db30169098ab56c7':
frameworks/base: Avoid Long object allocations in Long.valueOf()
Change-Id: I23e77831c7f167da8329143710cd9c4fb389df0e
2016-04-22 10:42:36 +00:00
Tobias Thierer
09ae4931a9
Merge "frameworks/base: Avoid Long object allocations in Long.valueOf()"
2016-04-22 10:27:27 +00:00
Tobias Thierer
a1adc6ff82
Fix needless value boxing/unboxing in Am.java
...
(except the Long unboxing covered by a separate CL).
Tested: Successfully built frameworks/base
Bug: 28289401
Change-Id: I40d09af9c003b7667cb96171747bd355d7a9dc4f
2016-04-21 18:51:25 +01:00
Tobias Thierer
4bd017d6a5
frameworks/base: Avoid Long object allocations in Long.valueOf()
...
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()
Tested: built frameworks/base successfully.
Bug: 28289401
Change-Id: I1fad536853a68c7b0707cbf02989aca155064843
2016-04-21 16:23:56 +01:00
Tobias Thierer
a2ad95a1e3
Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."
...
am: c027ae49f0
* commit 'c027ae49f0a941c73c692e1153b2a6623fdae152':
Integer.valueOf() -> Integer.parseInt() to avoid allocation.
Change-Id: I8cb16c650ea35299a99a878134c3060d4ae6ed1e
2016-04-21 13:38:52 +00:00
Tobias Thierer
c027ae49f0
Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."
2016-04-21 13:23:18 +00:00
Tobias Thierer
9bbbf2b15f
Integer.valueOf() -> Integer.parseInt() to avoid allocation.
...
Bug: 28289401
Change-Id: If767f891644a06ba587f9bb55dccea4089a8c66d
2016-04-21 12:09:29 +01:00
Henrik Baard
790699db64
Merge "Doze settings example not matching real keys"
...
am: 570a13f
* commit '570a13f0cb233b4a216243025a9fed3df3c72849':
Doze settings example not matching real keys
Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f
2016-04-20 22:51:47 +00:00
Adam Lesinski
570a13f0cb
Merge "Doze settings example not matching real keys"
2016-04-20 22:37:18 +00:00
Yang Ni
3c207ff5af
Merge "Made Element accessors thread-safe"
...
am: acd0061
* commit 'acd0061f908f7f9d9545d2729ce46d83ab349e58':
Made Element accessors thread-safe
Change-Id: I669c5b09b459da6dfe1a6a39af46b1eca1f16e2d
2016-04-20 18:20:35 +00:00
Yang Ni
acd0061f90
Merge "Made Element accessors thread-safe"
2016-04-20 18:14:08 +00:00
Yang Ni
6bdfe0fc5c
Made Element accessors thread-safe
...
Bug: 28177082
Change-Id: I8f3f2d8ce559e93cba29f8eedd5b95d1389deb23
(cherry picked from commit 33703f0c4e )
2016-04-20 09:49:36 -07:00
Yi Kong
448d39f7ae
Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce"
...
am: d5aca1a
* commit 'd5aca1aae2b3d3fd3aca1870b27ac66ca97ad5f3':
Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce
Change-Id: I92265f26f3331973a3bd8415b1018e8e0243ec35
2016-04-20 15:44:56 +00:00
Yi Kong
d5aca1aae2
Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce"
2016-04-20 15:36:54 +00:00
Yi Kong
d7c695d25b
Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce
...
Bug: 27704598
Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7
2016-04-20 14:52:56 +00:00
Yang Ni
d976ea9e47
Merge "Fixed ScriptGroup finalizer for old API"
...
am: 1d0b9e2
* commit '1d0b9e2f46b680c4530dd89d5331d3a482bb21b9':
Fixed ScriptGroup finalizer for old API
Change-Id: I07c56102ac267fd4e6d671f0b34f0bb78521b426
2016-04-19 18:11:59 +00:00
Yang Ni
1d0b9e2f46
Merge "Fixed ScriptGroup finalizer for old API"
2016-04-19 18:02:01 +00:00
Yang Ni
e04e5d7cc0
Fixed ScriptGroup finalizer for old API
...
Bug: 28242626
ScriptGroup finalizer clears out the list of closures, which is
uninitialized for the old API.
Need to check null first, before accessing the list.
Change-Id: Ibf914e17a0878c8c561f823c5f6f6f6619594de1
(cherry picked from commit 07837d6dab )
2016-04-19 09:46:47 -07:00
Henrik Baard
eac10ab5f4
Doze settings example not matching real keys
...
The keys used in the example for the Doze timeouts does
not match any real key. To avoid confusion the example
should match the existing keys.
Change-Id: I0306c542dac9e38aea7d172a3e0f7472d327c73c
2016-04-19 07:50:24 +02:00
Yifan Bai
4bc0c30b3c
Merge "Fix issues of different phone objects sharing same mConnectionApns list."
...
am: e05bdb1
* commit 'e05bdb15e519fb0d7575d33cb08ff9e17b117568':
Fix issues of different phone objects sharing same mConnectionApns list.
Change-Id: I8c422a3e3c80e7ceeb55bfdc518eae5626425f4d
2016-04-18 22:02:59 +00:00
Robert Greenwalt
e05bdb15e5
Merge "Fix issues of different phone objects sharing same mConnectionApns list."
2016-04-18 21:58:05 +00:00
Yi Kong
bbe2b3b341
Merge "Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af"
...
am: c75055e
* commit 'c75055ebd8c7c53d1a5410b63fbe9113fd2b95ba':
Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af
Change-Id: Ic589541339c0774e82e75cd004ddc3c9c0b04bbb
2016-04-18 10:06:30 +00:00
Yi Kong
c75055ebd8
Merge "Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af"
2016-04-18 09:57:23 +00:00
zhangshuxiao
72fa0d42e6
Merge "When the applicantion is removed, reset network permission of this uid."
...
am: bf7520e
* commit 'bf7520ec79ef6846267ac00fd24ef9fc912ddafd':
When the applicantion is removed, reset network permission of this uid.
Change-Id: Ie9576e809cdabfd95755d82a325f55f63ef39d55
2016-04-18 07:02:59 +00:00
Lorenzo Colitti
bf7520ec79
Merge "When the applicantion is removed, reset network permission of this uid."
2016-04-18 06:54:00 +00:00
Andreas Gampe
f664e82270
Merge "Frameworks/base: Fix old code in MediaPlayer"
...
am: 17b069c
* commit '17b069c0f4092d9eee7c1861044bbbef775ef2a5':
Frameworks/base: Fix old code in MediaPlayer
Change-Id: I5529b6224c747cb9f042520fc707ec78c95b3c9e
2016-04-16 00:46:22 +00:00
Andreas Gampe
17b069c0f4
Merge "Frameworks/base: Fix old code in MediaPlayer"
2016-04-16 00:40:01 +00:00
Yi Kong
418d3817a0
Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af
...
Bug: 28108421
Change-Id: Id0253fed98790f4c8eeb27877e14cf53474f29f0
2016-04-15 23:19:10 +00:00
Christopher Wiley
3ab9d65161
Merge "libfilterfw_jni needs libmedia include paths"
...
am: e004a913
* commit 'e004a913c3fa04ca682d4a6d9bb7f1e67f682e50':
libfilterfw_jni needs libmedia include paths
Change-Id: I7a9ac1f79ab2e311a183603faf0bf02fb343b8e8
2016-04-14 18:26:22 +00:00
Christopher Wiley
e004a913c3
Merge "libfilterfw_jni needs libmedia include paths"
2016-04-14 18:19:17 +00:00
Christopher Wiley
17634ea84d
Merge "libstorage needs libbinder include paths"
...
am: c91f028
* commit 'c91f028b85f7bc8e24c275e8d50d476e250a875f':
libstorage needs libbinder include paths
Change-Id: Iac4c90f3a0111149e7593858ee70ee6a8fc9311d
2016-04-14 18:13:27 +00:00
Treehugger Robot
c91f028b85
Merge "libstorage needs libbinder include paths"
2016-04-14 18:03:25 +00:00
Christopher Wiley
6ac565687b
libfilterfw_jni needs libmedia include paths
...
This library includes libmedia headers, and needs its full include path.
Bug: 27804373
Test: This code compiles with a slightly modified libmedia include
path.
Change-Id: Ic9253c0f0e7236435f36f2baf47411ca7db187cd
2016-04-14 10:21:03 -07:00
Christopher Wiley
1e06bde16e
libstorage needs libbinder include paths
...
This library is almost all binder related. It should be
using libbinder's published include path.
Bug: 27804373
Test: This library compiles with a slightly modified libbinder include
path.
Change-Id: Ib8e00b59604cdda69ec36cf1c90150b4b9033879
2016-04-14 10:16:33 -07:00
Shubham Ajmera
04a77cbcd3
Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00"
...
am: 11b076b
* commit '11b076b7d35054709e5d072fdc874d1a20835328':
Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Change-Id: I49e2d0b118f7a1617abec007522f02f45aff4a5d
2016-04-14 15:45:21 +00:00
Shubham Ajmera
11b076b7d3
Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00"
2016-04-14 15:39:04 +00:00
Michael Wright
106b00d6ed
Merge "Change storage duration to static for native choreographer."
...
am: a1ef6e7
* commit 'a1ef6e7d22bed25ea624bc8d2c8fea9a951508c1':
Change storage duration to static for native choreographer.
Change-Id: I0bbef00b28695b6e20cce44f662e31760761bd13
2016-04-14 10:00:01 +00:00
Martijn Coenen
a1ef6e7d22
Merge "Change storage duration to static for native choreographer."
2016-04-14 09:52:10 +00:00
Michael Wright
c0d3d3f805
Change storage duration to static for native choreographer.
...
This ensures that the region is zero initialized, regardless of compiler.
Change-Id: Ie0bfa5d2cd2486ba31a45aee4de6c370513bfc62
2016-04-14 10:18:09 +02:00
Michael Wright
6d53167ffd
Merge "Add choreographer API to the NDK."
...
am: 2853711
* commit '2853711f7766bb04e37f98ee3a4cbdd04eafceda':
Add choreographer API to the NDK.
Change-Id: I7dc5cdca4d6a95feecb0260fdbc367553e08b62d
2016-04-14 08:16:56 +00:00
Martijn Coenen
2853711f77
Merge "Add choreographer API to the NDK."
2016-04-14 08:11:45 +00:00
Shubham Ajmera
c9852123e8
Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
...
Bug: 27426743
(cherry-picked from commit a871ab1687 )
Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4
2016-04-13 17:59:36 +01:00