Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
435,927 Commits 3 Branches 0 Tags
70b752f4e07e35eb7e332394ae478187fafc66ac
Commit Graph

435927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chalard Jean
70b752f4e0 Merge "Rename CallbackRecord to CallbackEntry" am: 36ad0924b9 am: cbc0d9dbfc 
am: 71a03d5538

Change-Id: If53d8d66c21d27a5e77a48a5234092aaa0bf8ad0
 2019-10-06 23:03:02 -07:00
Chalard Jean
71a03d5538 Merge "Rename CallbackRecord to CallbackEntry" am: 36ad0924b9 
am: cbc0d9dbfc

Change-Id: I07ef4756a74c0c670fc5fbb4bdd8ac61344adc0a
 2019-10-06 22:50:49 -07:00
Chalard Jean
cbc0d9dbfc Merge "Rename CallbackRecord to CallbackEntry" 
am: 36ad0924b9

Change-Id: Ibfe98cf26ee65711b5366edfc5d95e64dcfec266
 2019-10-06 22:39:47 -07:00
Chalard Jean
36ad0924b9 Merge "Rename CallbackRecord to CallbackEntry" 2019-10-07 05:28:57 +00:00
Chalard Jean
059c426d15 Rename CallbackRecord to CallbackEntry 
Test: FrameworkNetTests NetworkStackTests
Change-Id: I8f6ea8fb6879cf7c40396d92f13cb5e12cc45ee7
 2019-10-07 13:00:50 +09:00
Android Build Merger (Role)
dcad223fb3 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours am: efec4764b4 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-06 06:52:28 +00:00
Bill Yi
11d487498e [automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours 
am: efec4764b4 -s ours
am skip reason: subject contains skip directive

Change-Id: I33cb88cdcb797a7868d32f8caead5aa6707e8dc9
 2019-10-05 23:50:45 -07:00
Bill Yi
039759c1c9 [automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours 
am: 14b68c1231 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibff41789e28aed1039e937beb0bb3d24e51d10c1
 2019-10-05 23:50:41 -07:00
Bill Yi
efec4764b4 [automerger skipped] Import translations. DO NOT MERGE 
am: 332e8f4e81 -s ours
am skip reason: subject contains skip directive

Change-Id: Id2f6efd386d21d7a80994896ed40f45d896e4716
 2019-10-05 23:30:09 -07:00
Bill Yi
14b68c1231 [automerger skipped] Import translations. DO NOT MERGE 
am: 332e8f4e81 -s ours
am skip reason: subject contains skip directive

Change-Id: I15f0d2a038a48ebca16ecb7890109f808583befb
 2019-10-05 23:30:08 -07:00
Bill Yi
c954634c87 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: e258cc65f6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia782c09a9bc42c0c4ac3ed3586bd42c1337e6ed1
 2019-10-05 23:17:36 -07:00
TreeHugger Robot
e258cc65f6 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-06 05:53:16 +00:00
Bill Yi
f0cd160410 Import translations. DO NOT MERGE 
Change-Id: I995c79defa649cee05b3c78398c329876f5bc98e
Auto-generated-cl: translation import
 2019-10-05 17:27:08 -07:00
Bill Yi
332e8f4e81 Import translations. DO NOT MERGE 
Change-Id: Iae1b021de5e543f5b157cde38e1f693a104f1fbe
Auto-generated-cl: translation import
 2019-10-05 17:17:00 -07:00
Dan Shi
849b46edb1 Merge "Move CtsDevicePolicyManagerTestCases to its own group" am: 03f8581876 am: caf2ca8cc3 
am: 117dada7ec

Change-Id: I8cb3600c9968d4f1994899c0d20b6051607c2f81
 2019-10-05 16:56:20 -07:00
Dan Shi
117dada7ec Merge "Move CtsDevicePolicyManagerTestCases to its own group" am: 03f8581876 
am: caf2ca8cc3

Change-Id: I3c4828cf5353cbe7d2a8506f683abc6431c9f17e
 2019-10-05 16:50:13 -07:00
Dan Shi
caf2ca8cc3 Merge "Move CtsDevicePolicyManagerTestCases to its own group" 
am: 03f8581876

Change-Id: I4040c640bf30b7c64eeb03e3301e8f929890c79b
 2019-10-05 16:43:59 -07:00
Dan Shi
03f8581876 Merge "Move CtsDevicePolicyManagerTestCases to its own group" 2019-10-05 23:29:39 +00:00
Bill Yi
a9468e1c3f [automerger skipped] Import translations. DO NOT MERGE 
am: 9519141cd6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia896d947073dcb9519d8d56c8c3d03488fecea45
 2019-10-05 13:44:04 -07:00
Dan Shi
3ed7d223e8 Merge "Sync TEST_MAPPING file from master branch" am: 38b83f0558 am: fbf163294a 
am: 0550352f2e

Change-Id: I3541b76296d2de1f7d34d8124fc4ee90595841da
 2019-10-05 12:43:29 -07:00
Dan Shi
0550352f2e Merge "Sync TEST_MAPPING file from master branch" am: 38b83f0558 
am: fbf163294a

Change-Id: I23b25f09c35326a0608e6d30eaa3e7e65f1b5582
 2019-10-05 12:37:30 -07:00
Dan Shi
fbf163294a Merge "Sync TEST_MAPPING file from master branch" 
am: 38b83f0558

Change-Id: Ie836bbf345dfd54f657b96bc02b2c44c166d93f4
 2019-10-05 12:25:17 -07:00
Dan Shi
38b83f0558 Merge "Sync TEST_MAPPING file from master branch" 2019-10-05 18:57:34 +00:00
Bill Yi
9519141cd6 Import translations. DO NOT MERGE 
Change-Id: I9f9de2b8c2eba8c43c8f99ff2ad24a2af42609d7
Auto-generated-cl: translation import
 2019-10-05 07:08:42 -07:00
Dan Shi
994414753f Move CtsDevicePolicyManagerTestCases to its own group 
Rebase from master branch

Bug: 141061952
Test: none
Change-Id: I54d9e1fbaa1bab11581bcd66d55255ae713b1bf6
 2019-10-04 22:45:39 -07:00
Dan Shi
78fdd5605f Sync TEST_MAPPING file from master branch 
Bug: 141061952
Test: none
Change-Id: I5ed8cb0d499a75562f8db32989eed32a8a877ae7
 2019-10-04 22:43:37 -07:00
Shuo Qian
b162d468fd Merge "Change the Listener API names" am: fe6978a73f am: 05430c9d1f 
am: bc79a1c468

Change-Id: Ie1672f6e103dd59ee97b54681836d0e1fda7c2ae
 2019-10-04 19:56:27 -07:00
Shuo Qian
bc79a1c468 Merge "Change the Listener API names" am: fe6978a73f 
am: 05430c9d1f

Change-Id: If02631e54c5d410bf5c889ecb3a9f217318e5692
 2019-10-04 19:49:22 -07:00
Shuo Qian
05430c9d1f Merge "Change the Listener API names" 
am: fe6978a73f

Change-Id: Icf860de451298632635ad15ba0d1c7701b83073e
 2019-10-04 19:41:12 -07:00
Treehugger Robot
fe6978a73f Merge "Change the Listener API names" 2019-10-05 01:56:54 +00:00
Mingguang Xu
bd2c67b336 Merge "Revert "Wifi usability: Change the unit of the threshold for tx/rx throughput from Mbps to Kbps"" into qt-qpr1-dev 
am: 9c1464d7ca

Change-Id: If7613b0b002a3462de5475e000a23b711d2ab5b1
 2019-10-04 16:46:49 -07:00
Mingguang Xu
9c1464d7ca Merge "Revert "Wifi usability: Change the unit of the threshold for tx/rx throughput from Mbps to Kbps"" into qt-qpr1-dev 2019-10-04 23:27:38 +00:00
Mingguang Xu
038345da61 Revert "Wifi usability: Change the unit of the threshold for tx/rx throughput from Mbps to Kbps" 
This reverts commit 078fe45552.

Reason for revert: This change introduced a bug and it completely changed the functionality of WiFi data stall detection, e.g., high Tx link speed can easily trigger data stall.  We would like to roll back them to restore the normal functionality of Wifi data stall detection.

Bug: 141995185

Change-Id: I024808b580955545b084112c4b14921f038b595f
Merged-In: I078d28ed81a84e32aaece839a51590364a974481
 2019-10-04 21:19:53 +00:00
Shuo Qian
d96637660f Change the Listener API names 
Test: cts
Bug: 135204580
Change-Id: I1f64d6eb6b113ca85f43a3f6a578c68dbb8bd5ed
 2019-10-04 13:24:23 -07:00
Philip P. Moltmann
7dc5cc80fe [automerger skipped] Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev am: 0a71df1f7e am: 43f6144e21 
am: 273a67d261 -s ours
am skip reason: change_id I65c71569d0dd8a40bc6fecabb22c5373dd6e806e with SHA1 7fe065eb66 is in history

Change-Id: I3db7c28eb045cdc2564d5803b3f41babf810de3d
 2019-10-04 12:27:10 -07:00
Philip P. Moltmann
36329e5725 Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev am: 0a71df1f7e am: 43f6144e21 
am: 7cd4256dde

Change-Id: I2cdc90ac3af6e1a89bd79d13f5baa637864e7ccb
 2019-10-04 12:20:06 -07:00
Philip P. Moltmann
7cd4256dde Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev am: 0a71df1f7e 
am: 43f6144e21

Change-Id: Ib8548cbfc7531a5f5e9100ae26cf9b6c8f97760f
 2019-10-04 12:05:17 -07:00
Philip P. Moltmann
273a67d261 Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev am: 0a71df1f7e 
am: 43f6144e21

Change-Id: Ie6ef9dd529218711a88f19e921c260e2feb59c28
 2019-10-04 11:57:17 -07:00
Philip P. Moltmann
43f6144e21 Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev 
am: 0a71df1f7e

Change-Id: I658626de14fa325e08db3aead53707d8d3e00d3b
 2019-10-04 11:43:06 -07:00
Bryan Ferris
c029de90ee Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev am: 06684aed55 am: b2450ab526 
am: 004ad5dae9

Change-Id: I48be980b4f274441f5683debe6e32f2db0d95320
 2019-10-04 11:26:52 -07:00
Philip P. Moltmann
0a71df1f7e Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev 2019-10-04 18:23:30 +00:00
Bryan Ferris
c3c323cac6 Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev am: 06684aed55 am: b2450ab526 
am: e0c730671a

Change-Id: I07d1971fbaa2e31dab2cca6715f4308706a518b2
 2019-10-04 11:23:26 -07:00
Bryan Ferris
004ad5dae9 Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev am: 06684aed55 
am: b2450ab526

Change-Id: Ib1b938ade41fd17010f59c5cbe4e7495d6086b12
 2019-10-04 11:08:41 -07:00
Bryan Ferris
e0c730671a Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev am: 06684aed55 
am: b2450ab526

Change-Id: I468c17380579d2caad0991e55043f68e10eb5a1a
 2019-10-04 11:05:20 -07:00
Bryan Ferris
b2450ab526 Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev 
am: 06684aed55

Change-Id: I166f54becf2d4fa99939c1d9b5e9c335f70e8a69
 2019-10-04 10:57:23 -07:00
Bryan Ferris
06684aed55 Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev 2019-10-04 17:42:36 +00:00
Tobias Thierer
b12401b24d Merge "Construct default MimeMap lazily rather than eagerly." am: 7dbc7ed543 am: 59d2c429bb 
am: bfd4e55a48

Change-Id: I8110cd6d464b5d0b79498cb68cf1267402b139d8
 2019-10-04 10:15:24 -07:00
Tobias Thierer
bfd4e55a48 Merge "Construct default MimeMap lazily rather than eagerly." am: 7dbc7ed543 
am: 59d2c429bb

Change-Id: I023b1d784814499319c62db7e7647ce14e7c0fba
 2019-10-04 10:00:29 -07:00
Tobias Thierer
59d2c429bb Merge "Construct default MimeMap lazily rather than eagerly." 
am: 7dbc7ed543

Change-Id: I60c43606e536872455e8220745bf9094b0d9f56c
 2019-10-04 09:47:38 -07:00
Shuo Qian
07ac796568 Merge "Add both Emergency Number listener for testing" am: 46cf71d1d0 am: 69eabb2397 
am: bbcbf281d1

Change-Id: I864072e7c077ab95fd5619bfbccf0b3bee54e225
 2019-10-04 09:39:50 -07:00