drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
294,359 Commits 1 Branch 0 Tags
Commit Graph

294359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
e343eb145c AAPT2: Insert <uses-sdk> element before <application> 
PackageParser on the device uses the targetSdkVersion of the
app while it parses <application>. That means that if the
<uses-sdk> tag comes after <application>, the targetSdkVersion
is assumed to be 0.

Test: make libaapt2_tests
Change-Id: I60f2179a7ff44e7419217afb53f3d24f8c030f6e
 2016-10-27 16:31:58 -07:00
Sunny Goyal
584264f6af Merge "Adding support for async view loading in RemoteViewsAdapter" 2016-10-27 17:14:47 +00:00
Glen Kuhne
f501c31454 Merge "Move wifi.proto to shared service .jar" 2016-10-27 16:28:24 +00:00
Glen Kuhne
8902f81589 Merge "Move ipconnectivity.proto to services-proto.jar" 2016-10-27 16:27:27 +00:00
Philip P. Moltmann
411f8215fc Merge "Add UsbDeviceConnection.requestWait with a timeout" 2016-10-27 16:15:15 +00:00
Lorenzo Colitti
538f45a8b3 Merge changes from topic 'netd_aosp' am: d19524f4f2 am: 853427a30a am: 57ee5d7e9c 
am: 6f605a4e0f

Change-Id: I8013cd6a7abe6f1c40c183c3857972dec0679b63
 2016-10-27 15:33:22 +00:00
Michal Karpinski
5f05698a97 Add connect event reporting am: 265494a0f8 am: 17be4d6c85 am: 8fba923d2a 
am: c1b04a8b6a

Change-Id: I37be845fee3b9a46969b749ca3bca3d6f9425e2c
 2016-10-27 15:29:01 +00:00
Michal Karpinski
0311b5dfca Extending DNS event reporting am: f82d1596ce am: 3156b53fbe am: c1ca63e8cb 
am: 6b5c634752

Change-Id: Id7b964d1d0ec70957b79eac98cda24b145eea79e
 2016-10-27 15:27:36 +00:00
Eric Laurent
7f32fa70a9 Merge "radio: fix 64 bit process compatibility" 2016-10-27 15:23:08 +00:00
TreeHugger Robot
c024377dcf Merge "Implement getTransparentRegion() using SkLatticeIter" 2016-10-27 14:13:19 +00:00
Lorenzo Colitti
6f605a4e0f Merge changes from topic 'netd_aosp' am: d19524f4f2 am: 853427a30a 
am: 57ee5d7e9c

Change-Id: I4f38e704b362fb42c9a8704dee8b1b963008e55e
 2016-10-27 13:38:34 +00:00
Michal Karpinski
c1b04a8b6a Add connect event reporting am: 265494a0f8 am: 17be4d6c85 
am: 8fba923d2a

Change-Id: I20bca735eba409fe17c8c1bbec1bce20a1ca0723
 2016-10-27 13:31:09 +00:00
Michal Karpinski
6b5c634752 Extending DNS event reporting am: f82d1596ce am: 3156b53fbe 
am: c1ca63e8cb

Change-Id: I5c3a43d9835900e849da6db2a895c0131f19d538
 2016-10-27 13:30:02 +00:00
Lorenzo Colitti
57ee5d7e9c Merge changes from topic 'netd_aosp' am: d19524f4f2 
am: 853427a30a

Change-Id: I91cce5b10d49573a37504b6664b3ef0d13ae0d77
 2016-10-27 13:30:02 +00:00
Michal Karpinski
8fba923d2a Add connect event reporting am: 265494a0f8 
am: 17be4d6c85

Change-Id: I042fdb187af2de08374864867dbd75d8c92c56c9
 2016-10-27 13:21:37 +00:00
Lorenzo Colitti
853427a30a Merge changes from topic 'netd_aosp' 
am: d19524f4f2

Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70
 2016-10-27 13:20:34 +00:00
Michal Karpinski
c1ca63e8cb Extending DNS event reporting am: f82d1596ce 
am: 3156b53fbe

Change-Id: I14dfa7508c7115b0e60836b3788c421068b70946
 2016-10-27 13:20:31 +00:00
Michal Karpinski
17be4d6c85 Add connect event reporting 
am: 265494a0f8

Change-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8
 2016-10-27 13:13:56 +00:00
Michal Karpinski
3156b53fbe Extending DNS event reporting 
am: f82d1596ce

Change-Id: I2e39caad0074be519640b561201f75d6685c01ef
 2016-10-27 13:12:29 +00:00
Lorenzo Colitti
d19524f4f2 Merge changes from topic 'netd_aosp' 
* changes:
  Add connect event reporting
  Extending DNS event reporting
 2016-10-27 13:05:26 +00:00
Matt Sarett
7de7385897 Implement getTransparentRegion() using SkLatticeIter 
This allows us to delete utils/NinePatchImpl.cpp and
utils/NinePatch.h

Test: Passed cts tests - DrawableTest, NinePatchTest,
NinePatchDrawableTest.

Change-Id: I6b5d09fa3479e758d8b931fa0e977c25f4435a7c
 2016-10-27 08:22:38 -04:00
Diego Perez
4bcf5e7c47 Merge "Remove use of refSkPixelRef" 2016-10-27 10:15:41 +00:00
Michal Karpinski
265494a0f8 Add connect event reporting 
Adds reporting of connect events including netId, destination IP address,
destination port, uid and connect latency.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future CTS

Bug: 29748723

(cherry picked from commit 965894eeb90c13255b5559b925d13fd22528f8cb)

Change-Id: I0c563f26ac39a7e1870153f30d073fc7d0006abc
 2016-10-27 18:23:21 +09:00
Michal Karpinski
f82d1596ce Extending DNS event reporting 
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future unit and CTS

(cherry picked from commit 14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)

Bug: 29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
 2016-10-27 18:23:16 +09:00
Andrii Kulian
debcf7603f Merge "Refactor stack removal methods" 2016-10-27 07:52:07 +00:00
Bill Yi
01701d700c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac -s ours am: 3b2c3fe5ef -s ours am: ea109fa2c7 -s ours 
am: 3882273957  -s ours

Change-Id: Ifbad3f8490583242e7d80397b5f3b975e88d0830
 2016-10-27 05:34:10 +00:00
Bill Yi
1bf5f6a48e Import translations. DO NOT MERGE am: 1377e2b985 -s ours am: df305805c6 -s ours am: 51521f2e18 -s ours 
am: 973a754296  -s ours

Change-Id: Ief6e6da91a2a7745eb8092c211fdb7ba82b836ba
 2016-10-27 05:33:20 +00:00
Bill Yi
1a5667fa6c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45 -s ours am: d557ea9388 -s ours am: 0141333d25 -s ours 
am: 63b7b89c96  -s ours

Change-Id: I33df334e2fa701cc015e8125c5e2500df826936f
 2016-10-27 05:32:22 +00:00
Bill Yi
ec9b33d62e Import translations. DO NOT MERGE am: d1b8917270 -s ours am: 6296c78ee4 -s ours am: 044be18ae4 -s ours 
am: 901527ccef  -s ours

Change-Id: I8db225d899925c52922f41825183b043f866fc6f
 2016-10-27 05:31:22 +00:00
Bill Yi
4cb8229bfd Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5 -s ours am: f0a5ebb129 -s ours 
am: 1ef4b78ca3  -s ours

Change-Id: Idc0912b1f378417d5823f97701f8496755db6377
 2016-10-27 05:30:32 +00:00
Bill Yi
4c43cc004c Import translations. DO NOT MERGE am: bff09ae3c8 -s ours am: 305004ba4d -s ours 
am: 7abc47da41  -s ours

Change-Id: Ib4a3c8cc185c893f478ad8858fc7b5c61eb6c084
 2016-10-27 05:29:41 +00:00
Bill Yi
f06860ce08 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c2effd95e2 -s ours am: 6b8d9b2337 -s ours 
am: 269392893b  -s ours

Change-Id: I7b79f8e1d1052b53e3cb605f330a15c105f52a35
 2016-10-27 05:28:52 +00:00
Bill Yi
ccf01a5236 Import translations. DO NOT MERGE am: 644a22437f -s ours am: 316c6df269 -s ours 
am: ce37c7b14f  -s ours

Change-Id: Ie696fc1f7d83b172e5859e9f82498882d5460d21
 2016-10-27 05:28:04 +00:00
Bill Yi
3882273957 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac -s ours am: 3b2c3fe5ef -s ours 
am: ea109fa2c7  -s ours

Change-Id: I0db2a437d7449ebb7791c10615c248e1640cc132
 2016-10-27 05:25:03 +00:00
Android Build Merger (Role)
8a12f91c86 Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours am: b9cc1f603c -s ours" into nyc-mr2-dev am: d37981be5a -s ours am: 64d92dc381 -s ours" 2016-10-27 05:24:50 +00:00
Bill Yi
5e07185b4a Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours am: b9cc1f603c -s ours" into nyc-mr2-dev am: d37981be5a -s ours 
am: 64d92dc381  -s ours

Change-Id: Ib1ddc2a0926bea50e29b4e3ef7cb098a5e94823e
 2016-10-27 05:24:13 +00:00
Bill Yi
973a754296 Import translations. DO NOT MERGE am: 1377e2b985 -s ours am: df305805c6 -s ours 
am: 51521f2e18  -s ours

Change-Id: I4e07de2591fe8fbc4c8512fb47807aa434ab9a5a
 2016-10-27 05:24:09 +00:00
Android Build Merger (Role)
1aeab616cb Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours am: b9cc1f603c -s ours am: 38948cf86d -s ours am: d7546218b5 -s ours" 2016-10-27 05:23:58 +00:00
Bill Yi
bac88c9122 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours am: b9cc1f603c -s ours am: 38948cf86d -s ours 
am: d7546218b5  -s ours

Change-Id: Ib981dac3521a620263725bd684bb9ea618b0b966
 2016-10-27 05:23:23 +00:00
Bill Yi
63b7b89c96 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45 -s ours am: d557ea9388 -s ours 
am: 0141333d25  -s ours

Change-Id: I12544624bd86847af3528ec3f932d1442fee8f59
 2016-10-27 05:23:21 +00:00
Android Build Merger (Role)
336e493fc5 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a -s ours am: 521faf362a -s ours" 2016-10-27 05:23:10 +00:00
Bill Yi
914c5c8f41 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a -s ours 
am: 521faf362a  -s ours

Change-Id: I31e63888d11657f0ead8732e6af22282d66a23b5
 2016-10-27 05:22:34 +00:00
Bill Yi
901527ccef Import translations. DO NOT MERGE am: d1b8917270 -s ours am: 6296c78ee4 -s ours 
am: 044be18ae4  -s ours

Change-Id: I20f54a15d996b4fb1c786b1aabe8e090c5a558ca
 2016-10-27 05:22:26 +00:00
Android Build Merger (Role)
cf3d32580a Merge "Import translations. DO NOT MERGE am: 6e3055ee37 -s ours am: 0c78c9e049 -s ours" 2016-10-27 05:22:20 +00:00
Bill Yi
18b8111b2b Import translations. DO NOT MERGE am: 6e3055ee37 -s ours 
am: 0c78c9e049  -s ours

Change-Id: Ide1881569e565b54662c66ee44b90e6d215d5042
 2016-10-27 05:21:41 +00:00
Bill Yi
1ef4b78ca3 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5 -s ours 
am: f0a5ebb129  -s ours

Change-Id: Ia8d103f423f72e3a32005f3f2c424ae2adac0ab3
 2016-10-27 05:21:38 +00:00
Hugo Benichi
0ef948d76c Merge "ConnectivityServiceTest: mark flaky test as such" 2016-10-27 05:21:33 +00:00
Bill Yi
2bb5f40987 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 000e2093d2 -s ours 
am: c7b922bb83  -s ours

Change-Id: Ibe53e83a20755f14dc0f79b7aeae3686ab1c343f
 2016-10-27 05:20:49 +00:00
Bill Yi
7abc47da41 Import translations. DO NOT MERGE am: bff09ae3c8 -s ours 
am: 305004ba4d  -s ours

Change-Id: I43d0bd29cfb6ed5d332ee417c5b4e79d04b9b1b0
 2016-10-27 05:20:47 +00:00
Bill Yi
256d66b64a Import translations. DO NOT MERGE am: fc0224f880 -s ours 
am: 5eb8d7f3f3  -s ours

Change-Id: I3435809c9e16599e99d62ec7a40aa16b0254c8d0
 2016-10-27 05:19:57 +00:00