OSDN Git Service
Hall Liu [Wed, 10 May 2017 01:20:14 +0000 (01:20 +0000)]
Merge "Changes to MbmsStreamingManager for test app" am:
df57734354
am:
244912f414
Change-Id: Ib39d79b8cc592f361f0c53a34f3acb9e39a18a61
Android Build Merger (Role) [Wed, 10 May 2017 01:09:24 +0000 (01:09 +0000)]
Merge "Merge "NsdService: more cleanups" am:
903d64634a am:
49bc06d0f9" into nyc-mr2-dev-plus-aosp
Hugo Benichi [Wed, 10 May 2017 01:06:13 +0000 (01:06 +0000)]
Merge "NsdService: more cleanups" am:
903d64634a
am:
49bc06d0f9
Change-Id: I90b39bce4e5c31d83579054e1b0c8921e9c33810
Hall Liu [Wed, 10 May 2017 01:05:26 +0000 (01:05 +0000)]
Merge "Changes to MbmsStreamingManager for test app"
am:
df57734354
Change-Id: I661e2cb4609f556d31e464d1cadff459b9b80354
Hugo Benichi [Wed, 10 May 2017 01:00:34 +0000 (01:00 +0000)]
Merge "NsdService: more cleanups" am:
903d64634a
am:
49bc06d0f9
Change-Id: I908c067fd7931058ac8f171eed96061b12f7a961
Hugo Benichi [Wed, 10 May 2017 00:53:24 +0000 (00:53 +0000)]
Merge "NsdService: more cleanups"
am:
903d64634a
Change-Id: Id61e1e2e240134c44e06bc9d78075ffcff8b5ff6
Hall Liu [Wed, 10 May 2017 00:50:47 +0000 (00:50 +0000)]
Merge "Changes to MbmsStreamingManager for test app"
Hugo Benichi [Wed, 10 May 2017 00:37:10 +0000 (00:37 +0000)]
Merge "NsdService: more cleanups"
Hugo Benichi [Wed, 10 May 2017 00:30:59 +0000 (00:30 +0000)]
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am:
ba666e0621
am:
76dc14ec88
Change-Id: I64f50d63f56533264a94bf36520f6939b1e51a00
Hugo Benichi [Wed, 10 May 2017 00:23:06 +0000 (00:23 +0000)]
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks"
am:
ba666e0621
Change-Id: I6c25c2f5f95ac2ffefe263b34e95009b9823c254
Hugo Benichi [Wed, 10 May 2017 00:07:28 +0000 (00:07 +0000)]
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks"
Andre Eisenbach [Wed, 10 May 2017 00:04:19 +0000 (00:04 +0000)]
Merge "Bluetooth: Fix interval low/min values" am:
66deee2bd4
am:
0771cb13a2
Change-Id: I74e0987ed0b6bf17ad4ff04089d703143a512005
Andre Eisenbach [Tue, 9 May 2017 23:49:19 +0000 (23:49 +0000)]
Merge "Bluetooth: Fix interval low/min values"
am:
66deee2bd4
Change-Id: I42d9a56ca85715dae2093bada1ecadd0a4c0c74e
Andre Eisenbach [Tue, 9 May 2017 23:26:13 +0000 (23:26 +0000)]
Merge "Bluetooth: Fix interval low/min values"
Jakub Pawlowski [Tue, 9 May 2017 21:28:21 +0000 (14:28 -0700)]
Bluetooth: Fix interval low/min values
Bug:
38175945
Test: none
Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6
Android Build Merger (Role) [Tue, 9 May 2017 19:56:02 +0000 (19:56 +0000)]
Merge "Merge "Switch from libcrypto_static to libcrypto target" am:
4ad5256547 am:
44eb369c83" into nyc-mr2-dev-plus-aosp
Alex Klyubin [Tue, 9 May 2017 19:51:26 +0000 (19:51 +0000)]
Merge "Switch from libcrypto_static to libcrypto target" am:
4ad5256547
am:
44eb369c83
Change-Id: I5e499045158788cfab4eddb7bf80d39b087e8040
Android Build Merger (Role) [Tue, 9 May 2017 19:50:52 +0000 (19:50 +0000)]
Merge "Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371" into stage-aosp-master am:
7e93a915a6" into nyc-mr2-dev-plus-aosp
Ajay Panicker [Tue, 9 May 2017 19:49:14 +0000 (19:49 +0000)]
Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371" into stage-aosp-master
am:
7e93a915a6
Change-Id: Ia70f2280c410af337be5ffa59e4d442a2e073055
Android Build Merger (Role) [Tue, 9 May 2017 19:48:45 +0000 (19:48 +0000)]
Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371 am:
a3fe28806e" into nyc-mr2-dev-plus-aosp
Ajay Panicker [Tue, 9 May 2017 19:44:46 +0000 (19:44 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371
am:
a3fe28806e
Change-Id: I3bf50965a2d4087604e010718c2aee0f90ef4593
Alex Klyubin [Tue, 9 May 2017 19:26:13 +0000 (19:26 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
am:
4ad5256547
Change-Id: Iba529dac6e8c3fc62e0f6a700604299fa9e1f629
Alex Klyubin [Tue, 9 May 2017 19:13:51 +0000 (19:13 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
Android Build Merger (Role) [Tue, 9 May 2017 18:54:15 +0000 (18:54 +0000)]
Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371" into stage-aosp-master
Ajay Panicker [Tue, 9 May 2017 18:50:12 +0000 (18:50 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)"
am:
7df4093371
Change-Id: I6f3fa3a9f48113c20a8dc4912b782eab2c4ef39a
Ajay Panicker [Tue, 9 May 2017 18:23:43 +0000 (18:23 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am:
7df4093371
am:
a3fe28806e
Change-Id: Ice5081d34ba731026e6f3b6d9c7a0156334ec705
Ajay Panicker [Tue, 9 May 2017 18:05:55 +0000 (18:05 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)"
am:
7df4093371
Change-Id: Ie6a4af6f5ac48e529aaeee34d92f893e710d8278
Treehugger Robot [Tue, 9 May 2017 17:53:17 +0000 (17:53 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)"
Ajay Panicker [Tue, 2 May 2017 23:28:03 +0000 (16:28 -0700)]
Bluetooth: Move Bluetooth battery stats tracking (1/2)
Move Bluetooth battery stats tracking to AppScanStats for a more
unified tracking system.
Bug:
37720787
Test: cts-tradefed run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testBleScans
Perform BLE scan and check battery stats
Change-Id: Ie6c682374e6e258c291d3a11eede649c7747ef40
Hugo Benichi [Fri, 7 Apr 2017 06:20:56 +0000 (15:20 +0900)]
NetworkStatsFactory: fix double accounting on IPv6 only networks
For 464xlat scenarios on IPv6 networks, the clatd interface setup
introduces double counting of apps ipv4 traffic. NetworkStatsFactory was
accounting for this on the tx path, but not on the rx path. Also it did
not accounted for the 20 bytes added by the IPv6 header.
This patch subtract correctly the rx and tx traffic from the root uid on
the underlying interface, and also adds correctly the 20 bytes cost per
packet on the stacked interface for 464xlat traffic.
Test: added several new unit tests, based on synthetic data and real
data also.
Bug:
33681750
Change-Id: I2675643b220acbc6110179fa937d4c313b6f5e32
Erik Kline [Tue, 9 May 2017 10:47:03 +0000 (10:47 +0000)]
Merge "Refactor and improve logging." am:
c3d41d5093
am:
8af8235bca
Change-Id: Id583ab11513ab86f85d1c4001cf36e74fc521753
Erik Kline [Tue, 9 May 2017 10:40:29 +0000 (10:40 +0000)]
Merge "Refactor and improve logging."
am:
c3d41d5093
Change-Id: I8ef193a9ee0f5bf04ae18620c1a68228ed7ed929
Paul Duffin [Tue, 9 May 2017 10:36:03 +0000 (10:36 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am:
b2ac85e76d
am:
edefe593e3
Change-Id: I35a3d6230c92d892d5eb3936532929b28314273f
Treehugger Robot [Tue, 9 May 2017 10:33:50 +0000 (10:33 +0000)]
Merge "Refactor and improve logging."
Paul Duffin [Tue, 9 May 2017 10:29:59 +0000 (10:29 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am:
b2ac85e76d
Change-Id: I2c06dbace44b4578a6cd94cb62a3ae67e558aaaa
Paul Duffin [Tue, 9 May 2017 10:23:15 +0000 (10:23 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
Erik Kline [Mon, 8 May 2017 08:56:35 +0000 (17:56 +0900)]
Refactor and improve logging.
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passed
- "dumpsys connectivity" shows new log output
Bug:
32163131
Bug:
36504926
Change-Id: I14d6da18660223f7cace156cb6594ee18928a7b0
Hugo Benichi [Tue, 9 May 2017 06:23:46 +0000 (06:23 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13 am:
767ac317e2
am:
717238a614
Change-Id: Id7ca8a16da5774a00517cfb60b877d181a358353
Hugo Benichi [Tue, 9 May 2017 06:14:47 +0000 (06:14 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13
am:
767ac317e2
Change-Id: Ibf618a27b2e5cfb3e8a69528dfecd275b33f0336
Hugo Benichi [Tue, 9 May 2017 06:08:18 +0000 (06:08 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13
* changes:
NsdService: simple cleanups
NsdService: test coverage for client requests.
NsdManager: remove duplicated argument validation
Hugo Benichi [Mon, 24 Apr 2017 07:41:03 +0000 (16:41 +0900)]
NsdService: more cleanups
This patch does some simple refactoring around management of nsd service
enabled status.
Test: TODO
Bug:
37013369,
33298084
Change-Id: If1b124459a814cd0e821f683ccd568e30a698d2e
Hugo Benichi [Tue, 11 Apr 2017 05:42:47 +0000 (14:42 +0900)]
NsdService: simple cleanups
This patch replace some SparseArray<Integer> with SparseIntArray, and
simplify a value lookup function by using indexOfValue().
Test: TODO
Bug:
37013369,
33298084
Change-Id: I4872f8baa2bb2ff456c7f848d3afe2e7bcc9892e
Hugo Benichi [Fri, 28 Apr 2017 06:31:10 +0000 (15:31 +0900)]
NsdService: test coverage for client requests.
Adding coverage for:
- NsdManager client disconnection
- in-flight request GC
Test: new test passes
Bug:
37013369,
33298084
Change-Id: I92039f297cf99352bbf4196797933d89c0b819ff
Hugo Benichi [Tue, 2 May 2017 04:36:28 +0000 (13:36 +0900)]
NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.
This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.
This patch also includes a couple of other small cleanups.
Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug:
37013369
Change-Id: Iaad13e13976e9bf8f508d7188f823f8184ac414b
Yi Kong [Tue, 9 May 2017 00:34:20 +0000 (00:34 +0000)]
Merge "Remove unused lambda captures" am:
1101f45613
am:
c7ce115073
Change-Id: I284275ea9abc1eb1d6655372ddd27f9cb2eef4ab
Yi Kong [Tue, 9 May 2017 00:28:46 +0000 (00:28 +0000)]
Merge "Remove unused lambda captures"
am:
1101f45613
Change-Id: I371bd344d87a213393787a528121308c96c12d83
Yi Kong [Tue, 9 May 2017 00:19:08 +0000 (00:19 +0000)]
Merge "Remove unused lambda captures"
Alex Klyubin [Mon, 8 May 2017 21:09:03 +0000 (14:09 -0700)]
Switch from libcrypto_static to libcrypto target
libcrypto target offers the same static library as libcrypto_static.
Thus, there's no need to use libcrypto_static.
Test: make pbkdf2gen
Run pbkdf2gen with and without a password and confirm it works
Bug:
26160319
Change-Id: I89a60b7521e6c3df91421d0edf64a71b8b2c20e0
Sergey Prigogin [Mon, 8 May 2017 21:12:37 +0000 (21:12 +0000)]
Merge "Fix a NPE with outlineProvider="none"" am:
46a4fbb2e4
am:
65d65ec14b
Change-Id: Iae0cc89cea82009620a75ac03de86a72ea20f1bb
Julius D'souza [Mon, 8 May 2017 21:05:10 +0000 (21:05 +0000)]
DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am:
5b8250964b
am:
cc1435b7f3
Change-Id: If4b375aef8d90641d942b6e1e73d73cfcea6dc17
Sergey Prigogin [Mon, 8 May 2017 21:01:07 +0000 (21:01 +0000)]
Merge "Fix a NPE with outlineProvider="none""
am:
46a4fbb2e4
Change-Id: Ib14f6b5369d60c06a716b99dd0274872fc0d2a51
Julius D'souza [Mon, 8 May 2017 20:57:56 +0000 (20:57 +0000)]
DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed.
am:
5b8250964b
Change-Id: Ifbebbcba8838b83a5c2e7d6d815784733cc95618
Sergey Prigogin [Mon, 8 May 2017 20:44:11 +0000 (20:44 +0000)]
Merge "Fix a NPE with outlineProvider="none""
Paul Duffin [Wed, 1 Mar 2017 13:21:10 +0000 (13:21 +0000)]
Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug:
30188076
Test: make checkbuild
Change-Id: Ice80a29b420061f5d0af6eb46426455abf890e5e
Merged-In: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
Yi Kong [Mon, 8 May 2017 17:24:22 +0000 (10:24 -0700)]
Remove unused lambda captures
Test: build
Bug:
37752547
Change-Id: Id102e93fef06e9c818b27fa8a5c6218c319bdd30
Yang Ni [Mon, 8 May 2017 16:06:39 +0000 (16:06 +0000)]
Merge "Destroy Allocation right away on exception" am:
52bc790f61
am:
a37bef769a
Change-Id: Id67163535eeaa36d1cd9edd34d19ed04858d62a2
Yang Ni [Mon, 8 May 2017 16:00:34 +0000 (16:00 +0000)]
Merge "Destroy Allocation right away on exception"
am:
52bc790f61
Change-Id: I2724dd4adf68aa8330b10b8f596d9d7db3619e03
Yang Ni [Mon, 8 May 2017 15:52:07 +0000 (15:52 +0000)]
Merge "Destroy Allocation right away on exception"
Colin Cross [Sat, 6 May 2017 02:25:51 +0000 (02:25 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am:
d308803b82
am:
06a6e81c1d
Change-Id: Ib613e9f89275c2af534c0b341f6c1c14c9af819a
Colin Cross [Sat, 6 May 2017 02:19:49 +0000 (02:19 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp"
am:
d308803b82
Change-Id: I90804cba65863d6194d7dd683024b43297357f19
nharold [Sat, 6 May 2017 02:06:27 +0000 (02:06 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base' am:
abcc43d86a
am:
d38615b846
Change-Id: Ib24d0d0f98ca59684e64ea9a85dd230d17143cb8
Treehugger Robot [Sat, 6 May 2017 02:02:44 +0000 (02:02 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp"
nharold [Sat, 6 May 2017 01:55:40 +0000 (01:55 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base'
am:
abcc43d86a
Change-Id: Ib61b38a3fd065c3906e2e3f0863b83f2f4b740f4
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base'
* changes:
Move newFromRil() function to a utility class
Remove dependency on telephony-common from services/core
Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
Port Utility Functions from DefaultPhoneNotifier
Remove dependency on IccConstants from SmsManager
Move files from frameworks/opt/telephony to frameworks/base
Nathan Harold [Wed, 25 Jan 2017 01:08:34 +0000 (17:08 -0800)]
Move newFromRil() function to a utility class
Remove a dependency on frameworks/opt from SmsMessage for CDMA
-Code move to frameworks/opt/telephony../cdma/SmsMessageConverter
Bug:
33414487
Test: Manually verified GSM and CDMA SMS: MO and MT
Change-Id: I730d292c4aad6524b03b18c0751738a73a71ecf7
Nathan Harold [Wed, 14 Dec 2016 19:40:03 +0000 (11:40 -0800)]
Remove dependency on telephony-common from services/core
After migrating all the dependencies from frameworks/opt/telephony
to frameworks/base, the dependency is no longer needed and should
never have been created in the first place. Happily removed.
Bug:
33414487
Test: compilation
Change-Id: I261da4c6b819b3c960ce56d2cab5c80cb34e852e
Nathan Harold [Wed, 14 Dec 2016 19:24:48 +0000 (11:24 -0800)]
Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
-Move the OTASP_* constants from SST
-Update references to those constants in TelephonyRegistry
Bug:
33414487
Test: compilation
Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa
Nathan Harold [Wed, 14 Dec 2016 18:48:00 +0000 (10:48 -0800)]
Port Utility Functions from DefaultPhoneNotifier
-Move static utility functions from frameworks/opt/telephony/
..DefaultPhoneNotifier to a new utility class in frameworks/base
-Update TelephonyRegistry to point to the new functions.
Bug:
33414487
Test: compilation
Change-Id: I36a113cb5122569d451ec3a2dfa71d72d590fa52
Nathan Harold [Wed, 14 Dec 2016 03:03:09 +0000 (19:03 -0800)]
Remove dependency on IccConstants from SmsManager
-Redefine the length of the SmsRecord in SmsManager
Bug:
33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
Nathan Harold [Wed, 26 Apr 2017 01:27:08 +0000 (18:27 -0700)]
Move files from frameworks/opt/telephony to frameworks/base
Bug:
37688438
Test: compilation, boot on aosp_bullhead
Merged-In: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Change-Id: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Colin Cross [Thu, 20 Apr 2017 19:20:20 +0000 (12:20 -0700)]
Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
Merged-In: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
(cherry picked from commit
3f8fd40f285dba5b3639ee1e3d4e4544048c1446)
Yifan Hong [Sat, 6 May 2017 00:28:09 +0000 (00:28 +0000)]
Merge changes from topic 'libvintf_cp' am:
9bd4c20764
am:
7fbbc2e85d
Change-Id: Id3ce69c9f0642b1aad8acb9512870b239e652e95
Yifan Hong [Sat, 6 May 2017 00:26:53 +0000 (00:26 +0000)]
Add compatibility matrices to VintfObject.report() am:
4463d991be
am:
dd4156cb43
Change-Id: I877107d04b96038592a8aaf2c79aecdd316318f2
Yifan Hong [Sat, 6 May 2017 00:18:51 +0000 (00:18 +0000)]
Merge changes from topic 'libvintf_cp'
am:
9bd4c20764
Change-Id: I277b37789fdc78ed2dcb5c50c1fda9c40444a4e8
Yifan Hong [Sat, 6 May 2017 00:17:26 +0000 (00:17 +0000)]
Add compatibility matrices to VintfObject.report()
am:
4463d991be
Change-Id: I26c78cca5e807ee291bdb097d11d5f4ac43bba29
Treehugger Robot [Sat, 6 May 2017 00:11:31 +0000 (00:11 +0000)]
Merge changes from topic 'libvintf_cp'
* changes:
android.os.VintfObject: add API for EDI.
Add compatibility matrices to VintfObject.report()
Ruben Brunk [Fri, 5 May 2017 23:46:53 +0000 (23:46 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" am:
612b8bef0c
am:
0b34d001e4
Change-Id: Ie18a2a483bb08d924a93db4f7dd95c948a6fb323
Ruben Brunk [Fri, 5 May 2017 23:39:50 +0000 (23:39 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment"
am:
612b8bef0c
Change-Id: Ia71233576b7f8a712abf495164923a092cdc5677
Treehugger Robot [Fri, 5 May 2017 23:28:39 +0000 (23:28 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment"
Colin Cross [Fri, 5 May 2017 22:45:11 +0000 (22:45 +0000)]
Merge "Update path for libmediandk headers" am:
9d9aab48fa
am:
d1d283692f
Change-Id: I40746901ee18123838c6e50e429c178585566e32
Hall Liu [Thu, 27 Apr 2017 20:20:09 +0000 (13:20 -0700)]
Changes to MbmsStreamingManager for test app
Add binding methods to MbmsStreamingManager
Add constants for synchronous binding exceptions
Test: testapp
Change-Id: Ie798c6008029c4201ec1bb3c98c11c4a949a048a
Colin Cross [Fri, 5 May 2017 22:32:11 +0000 (22:32 +0000)]
Merge "Update path for libmediandk headers"
am:
9d9aab48fa
Change-Id: I339300d2e0c230069af0a7f08caff6449de37c85
Colin Cross [Fri, 5 May 2017 22:25:05 +0000 (22:25 +0000)]
Merge "Update path for libmediandk headers"
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug:
37544152
Bug:
37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
(cherry picked from commit
6bdc550e27e2c4e7b32bb91085eaac898d7d1156)
Kenny Root [Fri, 5 May 2017 21:25:56 +0000 (21:25 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master
am:
da0363104c
Change-Id: I2fd2dc2d580de6423111de1674b3999d87542878
Kenny Root [Fri, 5 May 2017 21:19:11 +0000 (21:19 +0000)]
Merge changes from topic 'update-conscrypt' am:
c497348c74
am:
37607dfca6
Change-Id: Iaa67f9512dd0447487b42d655c03c3c445068837
Android Build Merger (Role) [Fri, 5 May 2017 21:18:53 +0000 (21:18 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master
Kenny Root [Fri, 5 May 2017 21:18:09 +0000 (21:18 +0000)]
Track updates to Conscrypt am:
7fdce769c3
am:
0634c4f77f
Change-Id: I9cdad70a06353e3451cc3c1d4e1237f42b91fa24
Kenny Root [Fri, 5 May 2017 21:16:47 +0000 (21:16 +0000)]
Merge changes from topic 'update-conscrypt'
am:
c497348c74
Change-Id: Ifa261c6c003f3e0ca767356bc98c2c3033bd699a
Kenny Root [Fri, 5 May 2017 21:10:11 +0000 (21:10 +0000)]
Merge changes from topic 'update-conscrypt'
am:
c497348c74
Change-Id: Ie3b9d74ff46be9e4b00c6efe6748feb5e096cd3a
Kenny Root [Fri, 5 May 2017 21:08:48 +0000 (21:08 +0000)]
Track updates to Conscrypt
am:
7fdce769c3
Change-Id: I691f1ed588814311363f67b8ce43cbe247e54b71
Kenny Root [Fri, 5 May 2017 21:00:38 +0000 (21:00 +0000)]
Merge changes from topic 'update-conscrypt'
* changes:
Delete obsolete and unused KeyStoreTests
Track updates to Conscrypt
Colin Cross [Fri, 5 May 2017 00:58:11 +0000 (17:58 -0700)]
Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.
Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit
c8ed45d38f3b42e06c9e0980e133a84181752b5e)
Arun [Fri, 5 May 2017 19:04:45 +0000 (19:04 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164
am:
94f4f5e45f
Change-Id: I163bfb74ded3d7eacc5221980733099ca1d90002
Arun [Fri, 5 May 2017 18:58:47 +0000 (18:58 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
am:
057c7c3164
Change-Id: I32269ea47f637597efc73acc4e040c209b48a2ed
Treehugger Robot [Fri, 5 May 2017 18:50:11 +0000 (18:50 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
Colin Cross [Fri, 5 May 2017 15:39:20 +0000 (15:39 +0000)]
Merge "Convert libhwui to Android.bp" am:
31fb17bbf9
am:
f0d951361b
Change-Id: I30dee10c1e024777a3760d37cf5a80e79c083b2a
Yang Ni [Fri, 28 Apr 2017 15:49:01 +0000 (08:49 -0700)]
Destroy Allocation right away on exception
Bug:
28053584
To avoid holding the resource (surface) for too long.
Test: CTS on x86_64 emulator
Change-Id: I2fdec107c2a16b7dadbf78a9aee79c33423a3676
Colin Cross [Fri, 5 May 2017 15:28:42 +0000 (15:28 +0000)]
Merge "Convert libhwui to Android.bp"
am:
31fb17bbf9
Change-Id: I66401c892f90131e21efb36dc7316f905bd729d2
Treehugger Robot [Fri, 5 May 2017 15:17:21 +0000 (15:17 +0000)]
Merge "Convert libhwui to Android.bp"
OSDN Git Service
