Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
441,466 Commits 3 Branches 0 Tags
a4ea319b72c0caa4f076911b9284a2c64463b775
Commit Graph

441466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
a4ea319b72 Merge "Both build 32 and 64 architecture for TetheringTests" am: 736ed507d6 am: 6aca95071a 
Change-Id: I7df9227c4a563cd476419149f148e282ac29305a
 2020-01-07 21:12:51 +00:00
markchien
6aca95071a Merge "Both build 32 and 64 architecture for TetheringTests" 
am: 736ed507d6

Change-Id: Ifdad078ceab7a948629e5d6d8c4cca15da796359
 2020-01-07 12:42:47 -08:00
Automerger Merge Worker
626ceae57e Merge "Remove unused broadcast DATA_CONNECTION_FAILED" am: d8836ba33f am: 2d9062cc48 
Change-Id: Ic6046fc883372c42fd95886b143c1661b027cf6e
 2020-01-07 20:31:13 +00:00
Automerger Merge Worker
e1d4aa1ab4 Merge "Add isEmergencyApn" am: 660a94aea9 am: 01493ff22b 
Change-Id: I5fa0fa0b21db4c9796a0f0a3e15526eca285c7f8
 2020-01-07 20:30:19 +00:00
Treehugger Robot
736ed507d6 Merge "Both build 32 and 64 architecture for TetheringTests" 2020-01-07 20:30:15 +00:00
Automerger Merge Worker
7fa8a170b7 Merge "Revert submission 1182953-1576003954286-8455af5a" am: 06675f9106 am: 78f50dfb15 
Change-Id: I6380e885b458fa3656c413efb12cc3725bd33eaa
 2020-01-07 20:29:38 +00:00
Meng Wang
2d9062cc48 Merge "Remove unused broadcast DATA_CONNECTION_FAILED" 
am: d8836ba33f

Change-Id: Ibc5582f7e6ad9628baf0b2047a84048a86f001b3
 2020-01-07 12:14:16 -08:00
Jordan Liu
01493ff22b Merge "Add isEmergencyApn" 
am: 660a94aea9

Change-Id: I2cc69815894a426423396efb512986581b25c3e3
 2020-01-07 12:10:35 -08:00
Chen Xu
78f50dfb15 Merge "Revert submission 1182953-1576003954286-8455af5a" 
am: 06675f9106

Change-Id: Ib13d9717878f79649f68cb609e9ac42f575df062
 2020-01-07 12:07:06 -08:00
Meng Wang
d8836ba33f Merge "Remove unused broadcast DATA_CONNECTION_FAILED" 2020-01-07 19:59:36 +00:00
Jordan Liu
660a94aea9 Merge "Add isEmergencyApn" 2020-01-07 19:29:39 +00:00
Chen Xu
06675f9106 Merge "Revert submission 1182953-1576003954286-8455af5a" 2020-01-07 19:29:08 +00:00
Automerger Merge Worker
3ac69fd2b8 Merge "Do not use hidden HandlerExecutor" am: 166c8761a4 am: 2072de8ff8 
Change-Id: Ic4710704a12bd0bc061d26390199355ed926557c
 2020-01-07 18:55:38 +00:00
James Lin
2072de8ff8 Merge "Do not use hidden HandlerExecutor" 
am: 166c8761a4

Change-Id: I6a82684f3d12e01fb8aa7501a229348fc33ef4ea
 2020-01-07 10:41:50 -08:00
James Lin
166c8761a4 Merge "Do not use hidden HandlerExecutor" 2020-01-07 18:35:07 +00:00
Automerger Merge Worker
39d6ba888d Merge "Fix annotation / debugging" am: 69bbb1904f am: 1d866c0bf3 
Change-Id: I01e7c1b39e2c1df26f9b64c441136ccfbedcc77f
 2020-01-07 16:40:04 +00:00
Neil Fuller
1d866c0bf3 Merge "Fix annotation / debugging" 
am: 69bbb1904f

Change-Id: I9da174d658ada4acf399fe9f743b012aea7ebeae
 2020-01-07 08:29:19 -08:00
Neil Fuller
69bbb1904f Merge "Fix annotation / debugging" 2020-01-07 16:24:38 +00:00
Neil Fuller
4d10019960 Fix annotation / debugging 
Fix copy and paste errors from commit 4ab8a199de -
the API is new so does not need @UnsupportedAppUsage and
the debug log was incorrect.

Bug: 140712361
Test: build only
Change-Id: I123f76d011d7505d3dc053cb48c40353f0579d17
 2020-01-07 14:32:29 +00:00
Automerger Merge Worker
4de1014d6c Merge "android.net.http: Update OWNERS." am: 106d798af8 am: 55024898c8 
Change-Id: I3491c6ab0f7591ce3acfe89da8ec976d831da364
 2020-01-07 14:02:56 +00:00
Tobias Thierer
55024898c8 Merge "android.net.http: Update OWNERS." 
am: 106d798af8

Change-Id: I4f135178ae22b85d0c9196ac70ba6bc6b2793d80
 2020-01-07 05:50:18 -08:00
Sooraj Sasindran
041a6d3125 Do not use hidden HandlerExecutor 
Do not use hidden HandlerExecutor

Bug: 140908357
Test: Build

Change-Id: I998224991cb31d642435a23851aa18da3f00f159
Merged-In: I998224991cb31d642435a23851aa18da3f00f159
 2020-01-07 13:50:12 +00:00
Treehugger Robot
106d798af8 Merge "android.net.http: Update OWNERS." 2020-01-07 13:45:20 +00:00
Automerger Merge Worker
d2bf4f39b7 Merge "Add FrameworksNetIntegrationTests to postsubmit" am: 9933ad1e47 am: 45880d163f 
Change-Id: I9e25954eb1ebe7bfd2525c32d2edb6a8b47a66f1
 2020-01-07 13:18:35 +00:00
Remi NGUYEN VAN
45880d163f Merge "Add FrameworksNetIntegrationTests to postsubmit" 
am: 9933ad1e47

Change-Id: I3384970a0a961dfaaf10229ed9e5d39c4f552256
 2020-01-07 05:05:45 -08:00
Remi NGUYEN VAN
9933ad1e47 Merge "Add FrameworksNetIntegrationTests to postsubmit" 2020-01-07 12:16:34 +00:00
Automerger Merge Worker
f34444d4da Merge "Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite."" am: 8e56dc3951 am: 937c5b8b40 
Change-Id: Iabfdbe81c96ae2071a4e2baa2f74d14008f25aec
 2020-01-07 11:15:07 +00:00
Chun-Yi Lee
937c5b8b40 Merge "Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite."" 
am: 8e56dc3951

Change-Id: I0dabf8cf9e0bacd93f504f82d23d2e1f2bcfdb83
 2020-01-07 03:03:23 -08:00
Automerger Merge Worker
ef100e45fe Merge "Change NetworkTimeUpdateServiceImpl behavior" am: 48247d9223 am: f11a45b756 
Change-Id: Ie3b6457ba196f7aa00ffb6e2fa77e5acbb926374
 2020-01-07 10:30:35 +00:00
Treehugger Robot
8e56dc3951 Merge "Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite."" 2020-01-07 10:22:48 +00:00
Neil Fuller
f11a45b756 Merge "Change NetworkTimeUpdateServiceImpl behavior" 
am: 48247d9223

Change-Id: I299a69b5a3abf5da66237f79aa7ca56b6268452a
 2020-01-07 02:14:01 -08:00
Neil Fuller
48247d9223 Merge "Change NetworkTimeUpdateServiceImpl behavior" 2020-01-07 10:07:08 +00:00
Automerger Merge Worker
ef581020d3 Merge "Change tetheroffloadjni to tetheringutilsjni" am: 3e16a10a3e am: 75b0369615 
Change-Id: I913f33213bf208ef7733871222e57a21f0d460e6
 2020-01-07 09:25:49 +00:00
markchien
75b0369615 Merge "Change tetheroffloadjni to tetheringutilsjni" 
am: 3e16a10a3e

Change-Id: I48207d95cf6f512ec038fb5dc9ba4009c01d676d
 2020-01-07 01:12:30 -08:00
Treehugger Robot
3e16a10a3e Merge "Change tetheroffloadjni to tetheringutilsjni" 2020-01-07 09:05:43 +00:00
Chun-Yi Lee
4b027f3c9a Revert "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite." 
This reverts commit 1aa15ffa25.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I0515cd2e7c5e4d296def579e23c3ddbd59250711
 2020-01-07 08:42:41 +00:00
Automerger Merge Worker
e2c143c1d8 Merge "android.net: Update OWNERS." am: 2b89b0c7ca am: d913b9037a 
Change-Id: Ie7b5b2fedba3f56e612b0951b27fbb5b12d98e97
 2020-01-07 08:21:36 +00:00
Tobias Thierer
d913b9037a Merge "android.net: Update OWNERS." 
am: 2b89b0c7ca

Change-Id: I77ffc427638cf6297da48cb83449d455f7b6d220
 2020-01-07 00:03:08 -08:00
markchien
771c3e9a3d Change tetheroffloadjni to tetheringutilsjni 
Rename tetheroffloadjni to tetheringutilsjni and move setupRaSocket
jni method from NetUtils into tetheringutilsjni.

Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests
      -Off/On hotspot with ipv6 upstream

Change-Id: Ib68eb6999bbe2d3ca97e68712f22b105311ef800
 2020-01-07 07:42:13 +00:00
Treehugger Robot
2b89b0c7ca Merge "android.net: Update OWNERS." 2020-01-07 07:38:36 +00:00
Automerger Merge Worker
c1c1a355f0 Merge "Make TokenBucket available to the network stack" am: a6a681768c am: 0d25ca0ffd 
Change-Id: I14229aaeda5ffc27ef1db944e2be692184a6c366
 2020-01-07 07:16:44 +00:00
Automerger Merge Worker
1740e8698d Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
 2020-01-07 07:16:15 +00:00
johnson.yeh
0d25ca0ffd Merge "Make TokenBucket available to the network stack" 
am: a6a681768c

Change-Id: I94f2cc39d47e38a13b0d9b390f9c064b919dfe00
 2020-01-06 23:05:12 -08:00
Lorenzo Colitti
cf77c50b11 Merge changes If28f0be6,If0f80067 
am: 96529ad7fc

Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
 2020-01-06 23:03:04 -08:00
Treehugger Robot
a6a681768c Merge "Make TokenBucket available to the network stack" 2020-01-07 06:57:46 +00:00
Lorenzo Colitti
96529ad7fc Merge changes If28f0be6,If0f80067 
* changes:
  Make LinkPropertiesTest pass, and fix an NPE.
  Add the DHCP server address to LinkProperties.
 2020-01-07 06:43:20 +00:00
Automerger Merge Worker
281310f168 Merge "isTetheringApnRequired's permission is wrong." am: 6297d2548d am: bdce8daaf6 
Change-Id: I8f261ea142bc8fe2b31dd95061f6fdcd50407977
 2020-01-07 04:50:50 +00:00
SongFerng Wang
bdce8daaf6 Merge "isTetheringApnRequired's permission is wrong." 
am: 6297d2548d

Change-Id: Id80bd5f1696f7e7ba740ade70231d8dc252db9c1
 2020-01-06 20:41:41 -08:00
SongFerng Wang
6297d2548d Merge "isTetheringApnRequired's permission is wrong." 2020-01-07 04:34:59 +00:00
Automerger Merge Worker
3a1d7a5fcd Merge "Remove unused system_modules" am: 93318a40ee am: 36c0262bca 
Change-Id: I5ca4faa4ed784c0c922da928ea9b7e66f8aec053
 2020-01-07 04:19:20 +00:00