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

96625 Commits

Author SHA1 Message Date
Automerger Merge Worker
869646b5ab Merge "PersistableBundle: writeToStream/readFromStream" am: 0204e4a08e am: 083df1ec90 
Change-Id: I8823618f688d781f5a96549da695b45b0f561878
 2020-01-09 00:19:20 +00:00
Meng Wang
0204e4a08e Merge "PersistableBundle: writeToStream/readFromStream" 2020-01-08 23:47:40 +00:00
Automerger Merge Worker
1a7bc730ee Merge "Add API surface for ConnectivityDiagnostics API." am: afa0f1756e am: eb3bae3d11 
Change-Id: I762ac90f485af3c31afadb249f28363f5a34713f
 2020-01-08 22:44:10 +00:00
Cody Kesting
afa0f1756e Merge "Add API surface for ConnectivityDiagnostics API." 2020-01-08 21:53:14 +00:00
Meng Wang
2536134b12 PersistableBundle: writeToStream/readFromStream 
Bug: 143911192
Test: manual sanity test
Change-Id: I208487d572c8148f28fac3307873dfdc90996ae1
 2020-01-08 13:44:15 -08:00
Automerger Merge Worker
e219088375 Merge "Add setDisabledForSimNetworkLock to StatusBarManager" am: f428f58080 am: 33d3e85975 
Change-Id: Id3ea80c30e149588a6d97f02df978f258dda3495
 2020-01-08 21:13:09 +00:00
Hall Liu
f428f58080 Merge "Add setDisabledForSimNetworkLock to StatusBarManager" 2020-01-08 20:54:48 +00:00
Automerger Merge Worker
0d962baeea Merge changes from topics "vab_allocate", "vab_wait" am: d0c62b9dab am: dbdfc27520 
Change-Id: I2e6c97a2340b55dc8795767706c15588da1048f8
 2020-01-08 18:44:43 +00:00
Yifan Hong
d0c62b9dab Merge changes from topics "vab_allocate", "vab_wait" 
* changes:
  Use @ErrorCode for UpdateEngineCallback
  Add @ErrorCode annotation to UpdateEngine APIs
  Add UpdateEngine.cleanupSuccessfulUpdate
  Add UpdateEngine.allocateSpace
 2020-01-08 18:37:16 +00:00
Xin Li
45fa8ce95e Merge "DO NOT MERGE - Merge January 2020 Security Release into master" 2020-01-08 17:39:17 +00:00
Automerger Merge Worker
59d58f5cae Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: 8081ee1b35 
Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
 2020-01-08 17:14:42 +00:00
Artur Satayev
8081ee1b35 Merge "Use new UnsupportedAppUsage annotation." 
am: 9395887931

Change-Id: If7c0987b098608972ea743649561f5b803ea8d3c
 2020-01-08 08:55:00 -08:00
Artur Satayev
33f9217695 Use new UnsupportedAppUsage annotation. 
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
Merged-In: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
 2020-01-08 14:04:40 +00:00
Automerger Merge Worker
506e7c6b35 Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi" am: b5b0b321f6 am: fb1647dd3a 
Change-Id: Ic7afab228d5d1bb8f222fb2e828674b03c9dd3e4
 2020-01-08 03:31:37 +00:00
Aaron Huang
fb1647dd3a Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi" 
am: b5b0b321f6

Change-Id: I38532656d6abc4106399d14aa53230bf5b18f63b
 2020-01-07 19:28:04 -08:00
Automerger Merge Worker
89175d8aea Merge "Make the BluetoothHidHost class @SystemApi" am: 5e7e617e17 am: 41ccb1e08b 
Change-Id: I67034df8454b879dac49acb65b005273bd07be01
 2020-01-08 03:26:39 +00:00
Aaron Huang
b5b0b321f6 Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi" 2020-01-08 03:22:43 +00:00
Rahul Sabnis
41ccb1e08b Merge "Make the BluetoothHidHost class @SystemApi" 
am: 5e7e617e17

Change-Id: Ie7afa87f994e265cff0deac1b3f2d755792912f4
 2020-01-07 19:13:24 -08:00
Treehugger Robot
5e7e617e17 Merge "Make the BluetoothHidHost class @SystemApi" 2020-01-08 02:43:18 +00:00
Automerger Merge Worker
c294d8131a DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from am: 483da5385f am: 4314a0ca65 
Change-Id: I2ede64f2853e854dc1bd7d6f0d8b16a96b6f1d12
 2020-01-08 01:54:57 +00:00
Automerger Merge Worker
4314a0ca65 DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from am: 483da5385f 
Change-Id: Ia144921ee6ad424c565ca14713a275b9383e52cb
 2020-01-08 01:35:27 +00:00
Rahul Sabnis
9913cb52cf Make the BluetoothHidHost class @SystemApi 
Bug: 146462547
Test: Manual
Change-Id: I2044e850583701173b51ca89e30ff8aa79bb255c
 2020-01-07 17:02:22 -08:00
Automerger Merge Worker
01c6d1f405 Merge "docs: Add documentation for equals() method" into qt-dev am: 732a127636 am: 8bc1955d0e am: 45dbf8cc5a 
Change-Id: I42352aedf0b91b840078ada4566927c9878544fd
 2020-01-07 23:07:01 +00:00
Automerger Merge Worker
45dbf8cc5a Merge "docs: Add documentation for equals() method" into qt-dev am: 732a127636 am: 8bc1955d0e 
Change-Id: Ie77e185c38a1a5eda8efa73577d98babadb6e90d
 2020-01-07 22:54:47 +00:00
Automerger Merge Worker
8bc1955d0e Merge "docs: Add documentation for equals() method" into qt-dev am: 732a127636 
Change-Id: I306e8e186d2350f2dabb7238ad8b5c55d8e04e1d
 2020-01-07 22:41:40 +00:00
Kevin Hufnagle
732a127636 Merge "docs: Add documentation for equals() method" into qt-dev 2020-01-07 22:29:32 +00:00
Automerger Merge Worker
c170b84497 Merge "Add setConnectionPolicy to BluetoothPbap" am: c0c8c00976 am: 53c8e6cbc0 
Change-Id: I0bb2aae1c2809a4da648263a1e1df0f1bc2cfafc
 2020-01-07 21:13:34 +00:00
Rahul Sabnis
53c8e6cbc0 Merge "Add setConnectionPolicy to BluetoothPbap" 
am: c0c8c00976

Change-Id: I96a64f6a86392f1140884fc03f8059b5590e8736
 2020-01-07 12:56:19 -08:00
Treehugger Robot
c0c8c00976 Merge "Add setConnectionPolicy to BluetoothPbap" 2020-01-07 20:33:21 +00:00
Kevin Hufnagle
1757a96d7c docs: Add documentation for equals() method 
Explain the conditions that must be true in order for two objects
of type `ComponentName` to be considered equal.

Test: make ds-docs -j32

Bug: 62991861

Change-Id: I162ecd825b187ca688af11271a937e3740a4a833
Exempt-From-Owner-Approval: Docs-only change
 2020-01-07 18:30:50 +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
Treehugger Robot
106d798af8 Merge "android.net.http: Update OWNERS." 2020-01-07 13:45:20 +00:00
Automerger Merge Worker
ef100e45fe Merge "Change NetworkTimeUpdateServiceImpl behavior" am: 48247d9223 am: f11a45b756 
Change-Id: Ie3b6457ba196f7aa00ffb6e2fa77e5acbb926374
 2020-01-07 10:30:35 +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
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
1740e8698d Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
 2020-01-07 07:16:15 +00:00
Lorenzo Colitti
cf77c50b11 Merge changes If28f0be6,If0f80067 
am: 96529ad7fc

Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
 2020-01-06 23:03:04 -08: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