Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
426,262 Commits 3 Branches 0 Tags
810b42f039ef79798f0aababc6ceed3cd699ff02
Commit Graph

426262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
810b42f039 Merge "Inline readNetworkStatsDetailInternal, make mUseBpfStats final" am: dd98a70051 am: df3deaf33d 
am: af8b64a11f

Change-Id: I9125dc1aa39189a43b3c68618853e0a7a7298fe2
 2019-06-20 14:23:25 -07:00
Andreas Gampe
ca374124d0 Merge "LockAgent: Refactor violation data" am: afb660cb49 am: bea5f08d86 
am: 01e03da60a

Change-Id: I6abf88fd093db914071c0f3d5710c8e3c8bc0dc4
 2019-06-20 14:21:53 -07:00
Neil Fuller
dcf7d6e377 Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e am: a357696c2f 
am: 9ec43cc7fe

Change-Id: Id17253fbe7d22117dff5766ce5b50b4e446e5090
 2019-06-20 14:19:53 -07:00
Android Build Merger (Role)
7d84adaf44 Merge "Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9 am: 15199a5868" into qt-r1-dev-plus-aosp 2019-06-20 21:18:38 +00:00
Neil Fuller
d5cbad9f53 Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9 
am: 15199a5868

Change-Id: I35170185229a0e00f8b8f22f9560e49d844972c6
 2019-06-20 14:17:53 -07:00
Mehdi Alizadeh
9059f5cd57 Merge "Use RemoteCallbackList to store registered callbacks" into qt-dev am: 60f7b58a9a 
am: b97947dc2c

Change-Id: I234829c23042d6fd91b73aabb440f02c2b10a6c4
 2019-06-20 14:17:40 -07:00
Steven Moreland
9820b7231b [automerger skipped] Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev am: 303a891220 
am: 738d6b8950 -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: I38dc2e57e4bcdf09f4c3a2b08403b3e12cdf41ae
 2019-06-20 14:11:40 -07:00
Steven Moreland
8d7225e4ff libmedia2_jni: remove libhwbinder_noltopgo ref am: e5da40639c 
am: 82c428c0e3

Change-Id: Ic556fea286fead64416bc820ce5daa0139fcd600
 2019-06-20 14:11:28 -07:00
Benedict Wong
af8b64a11f Merge "Inline readNetworkStatsDetailInternal, make mUseBpfStats final" am: dd98a70051 
am: df3deaf33d

Change-Id: I8fc5e96150bc30ae87881feb5730be2fbb5891ac
 2019-06-20 14:11:17 -07:00
Dave Mankoff
d10fb72913 Merge changes from topic "b111394067-new-falsing-manager" into qt-dev am: acd240fbb3 
am: 4cc68a30de

Change-Id: I12827ab0a37fbf7079fdd82b298761beb205113e
 2019-06-20 14:10:27 -07:00
Andreas Gampe
01e03da60a Merge "LockAgent: Refactor violation data" am: afb660cb49 
am: bea5f08d86

Change-Id: Ib5a20d8b8aa81260883f4631a00390a819211d09
 2019-06-20 14:09:37 -07:00
Christine Franks
8646d29c9d Merge "Fix broken ColorDisplayServiceTest cases" into qt-r1-dev 
am: f351094e88

Change-Id: I1dd114df9ab2a86fbba730685e9dd67f3064363f
 2019-06-20 14:08:43 -07:00
Chalard Jean
bef7ff11e2 Merge "Factorize custom asserts." am: 6c176efa3d am: 99fbb40990 
am: f1eab99357

Change-Id: I8774ea64f004999ddb46223a76a671388687d455
 2019-06-20 14:06:58 -07:00
Neil Fuller
9ec43cc7fe Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e 
am: a357696c2f

Change-Id: I7db11188d9dd42e25b0aebd79acc92a9ba2f56a0
 2019-06-20 14:06:50 -07:00
Paul Duffin
44dd6138af [automerger skipped] Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" am: ff32698f0f am: daf0bb8611 -s ours 
am: e150e65301 -s ours
am skip reason: change_id I0260942108a13cc5e9bed1d6005abfb8daffe0ac with SHA1 8fcace4404 is in history

Change-Id: If7ad05eff48cb5920441aaf030d516f9bbba286c
 2019-06-20 14:04:50 -07:00
Neil Fuller
15199a5868 Merge "Remove unused class" am: 09f6675744 
am: 04ecb95ea9

Change-Id: I2f9c971db885bf7309438f2f44b18de4df62a709
 2019-06-20 14:04:12 -07:00
Chalard Jean
f1eab99357 Merge "Factorize custom asserts." am: 6c176efa3d 
am: 99fbb40990

Change-Id: I65ea7497abb8b77ebd10ba622075ef3b6c49b2a8
 2019-06-20 14:01:31 -07:00
Paul Duffin
e150e65301 [automerger skipped] Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" am: ff32698f0f 
am: daf0bb8611 -s ours
am skip reason: change_id I0260942108a13cc5e9bed1d6005abfb8daffe0ac with SHA1 8fcace4404 is in history

Change-Id: I909b892353da2cd927b87470f56f7c4892202e8c
 2019-06-20 13:58:08 -07:00
Mehdi Alizadeh
96675e7619 Merge "Use RemoteCallbackList to store registered callbacks" into qt-dev am: 60f7b58a9a 
am: 865b3b6210

Change-Id: I661f935eaada412e2d29a7a7e1ba301f646720d5
 2019-06-20 13:45:56 -07:00
Steven Moreland
f6e3d461fc [automerger skipped] Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev am: 303a891220 -s ours 
am: b69ccfd949 -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: I9ee86d9eabf64911ba33dad547d857996336570d
 2019-06-20 13:44:30 -07:00
Steven Moreland
cd53c193e6 [automerger skipped] libhwbinder users use libhidlbase am: 6c65bb208e -s ours 
am: 306ff7eaa2 -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: Ib4f47878b681c91af71d7a9f50b436363763f4e0
 2019-06-20 13:40:30 -07:00
Steven Moreland
c90ac82bc2 libmedia2_jni: remove libhwbinder_noltopgo ref am: e5da40639c 
am: c97f01184a

Change-Id: I62398b0cbfb069e7c2f62b46065b2663f05363e2
 2019-06-20 13:40:18 -07:00
Dave Mankoff
6fd848c2e3 Merge changes from topic "b111394067-new-falsing-manager" into qt-dev am: acd240fbb3 
am: 7fd2154d6d

Change-Id: Ia52bc7d5f3c22e22613fb321a47dd8f83c9387ce
 2019-06-20 13:38:33 -07:00
Benedict Wong
df3deaf33d Merge "Inline readNetworkStatsDetailInternal, make mUseBpfStats final" 
am: dd98a70051

Change-Id: I976335b43cc94cca8a5e63085748401f019c99b8
 2019-06-20 13:34:34 -07:00
Winson
7f74fb15e2 Merge "Fix ColorStateListDrawable bounds handling" into qt-dev am: fcbde5243a 
am: d518618ce9

Change-Id: Ia22d4b6c54b262f2fa6ef145845dab481ee47896
 2019-06-20 13:32:04 -07:00
Andreas Gampe
bea5f08d86 Merge "LockAgent: Refactor violation data" 
am: afb660cb49

Change-Id: I735673b6593a377e65d0d3735f7ddc879f961451
 2019-06-20 13:31:05 -07:00
Benedict Wong
dd98a70051 Merge "Inline readNetworkStatsDetailInternal, make mUseBpfStats final" 2019-06-20 20:25:31 +00:00
Neil Fuller
a357696c2f Merge "Switch to a single PacketSocketAddress constructor" 
am: 2d24f7a39e

Change-Id: I02a94993014b7c6e81c20b3e09f03c8fed88ae76
 2019-06-20 13:24:14 -07:00
Benedict Wong
8c9d8c5e05 Inline readNetworkStatsDetailInternal, make mUseBpfStats final 
This change inlines the logic from readNetworkStatsDetailInternal, and
reduces reundant checks in mUseBpfStats

Bug: 113122541
Test: atest FrameworksNetTests run, passing
Change-Id: If2ef8d8f038f32c8cf974aa02cfc1dc7e44dbad3
 2019-06-20 20:23:17 +00:00
Neil Fuller
04ecb95ea9 Merge "Remove unused class" 
am: 09f6675744

Change-Id: Ieb0a2b557a19dac51801513c66fac102c3b17b2d
 2019-06-20 13:23:11 -07:00
Chalard Jean
99fbb40990 Merge "Factorize custom asserts." 
am: 6c176efa3d

Change-Id: Ib57dfc7d7d42f8363d2b8b1d9b1a08290501ce67
 2019-06-20 13:22:15 -07:00
Paul Duffin
daf0bb8611 Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" 
am: ff32698f0f

Change-Id: Ie19a743e73d8349dc16b34e1a323cfc436356f32
 2019-06-20 13:19:58 -07:00
Mehdi Alizadeh
865b3b6210 Merge "Use RemoteCallbackList to store registered callbacks" into qt-dev 
am: 60f7b58a9a

Change-Id: I378003b120fadda0bb3867bd3afd112b03c4519f
 2019-06-20 13:16:20 -07:00
Mehdi Alizadeh
b97947dc2c Merge "Use RemoteCallbackList to store registered callbacks" into qt-dev 
am: 60f7b58a9a

Change-Id: I6eace2328a4397205e522b5525ecf8cae243c031
 2019-06-20 13:15:51 -07:00
Steven Moreland
b69ccfd949 [automerger skipped] Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev 
am: 303a891220 -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: Id71082f72c31a3e6eb49ef402936f16bb866214f
 2019-06-20 13:13:25 -07:00
Steven Moreland
306ff7eaa2 [automerger skipped] libhwbinder users use libhidlbase 
am: 6c65bb208e -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: I0b7e7c993df54024d7285f7b40b605462df822ac
 2019-06-20 13:09:48 -07:00
Steven Moreland
738d6b8950 Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev 
am: 303a891220

Change-Id: Ibc1c5fb1ccc095250f979b7720c6446ef71ea27b
 2019-06-20 13:09:43 -07:00
Steven Moreland
c97f01184a libmedia2_jni: remove libhwbinder_noltopgo ref 
am: e5da40639c

Change-Id: I8d0ef30e080f2adf31bc06a4ec23a8bb159b77f3
 2019-06-20 13:09:32 -07:00
Steven Moreland
82c428c0e3 libmedia2_jni: remove libhwbinder_noltopgo ref 
am: e5da40639c

Change-Id: Id0e562b34d28b2bd2feb766501b0c641b23fa9d4
 2019-06-20 13:09:30 -07:00
Dave Mankoff
7fd2154d6d Merge changes from topic "b111394067-new-falsing-manager" into qt-dev 
am: acd240fbb3

Change-Id: Iddabc77d92830eb79327a2ca7a7bd3f9f2f1a786
 2019-06-20 13:07:13 -07:00
Dave Mankoff
4cc68a30de Merge changes from topic "b111394067-new-falsing-manager" into qt-dev 
am: acd240fbb3

Change-Id: I83640ae5c6a6681eb33c87a70a629573f189d024
 2019-06-20 13:07:12 -07:00
Christine Franks
f351094e88 Merge "Fix broken ColorDisplayServiceTest cases" into qt-r1-dev 2019-06-20 20:00:22 +00:00
Mehdi Alizadeh
60f7b58a9a Merge "Use RemoteCallbackList to store registered callbacks" into qt-dev 2019-06-20 19:58:47 +00:00
Steven Moreland
303a891220 Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev 
* changes:
  libhwbinder users use libhidlbase
  libmedia2_jni: remove libhwbinder_noltopgo ref
 2019-06-20 19:09:01 +00:00
Winson
afc037a39b Merge "Fix ColorStateListDrawable bounds handling" into qt-dev am: fcbde5243a 
am: 1a971773e6

Change-Id: Id6e72d627981004327d7a91d0e2b146300235173
 2019-06-20 11:08:17 -07:00
Dave Mankoff
acd240fbb3 Merge changes from topic "b111394067-new-falsing-manager" into qt-dev 
* changes:
  Add ZigZagClassifier to the BrightLineFalsingManager.
  Add ProximityClassifier to the BrightLineFalsingManager
  Add DistanceClassifier to the BrightLineFalsingManager
  Add DiagonalClassifier to the BrightLineFalsingManager.
  Add TypeClassifier to the BrightLineFalsingManager.
  Add PointerCountClassifier to the BrightLineFalsingManager.
  Add base class for new falsing manager and classifiers.
 2019-06-20 18:05:19 +00:00
Winson
1a971773e6 Merge "Fix ColorStateListDrawable bounds handling" into qt-dev 
am: fcbde5243a

Change-Id: I3a619b554a7c59d29429efe1247c4a350874397d
 2019-06-20 11:03:28 -07:00
Christine Franks
771f5faab6 Fix broken ColorDisplayServiceTest cases 
Bug: 133173665
Test: atest FrameworksServicesTests:ColorDisplayServiceTest
Change-Id: Idb1ca2122bf5f5453fa4a890afc6a810e46cf532
 2019-06-20 17:57:27 +00:00
Winson
d518618ce9 Merge "Fix ColorStateListDrawable bounds handling" into qt-dev 
am: fcbde5243a

Change-Id: I80d466677b3e092de6905364c4536dcac5c2d1f4
 2019-06-20 10:57:16 -07:00
Andreas Gampe
afb660cb49 Merge "LockAgent: Refactor violation data" 2019-06-20 17:47:51 +00:00