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

96578 Commits

Author SHA1 Message Date
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
Lorenzo Colitti
348577e09f Make LinkPropertiesTest pass, and fix an NPE. 
aosp/973686 added the DHCP server address to LinkProperties, but
it did not have any tests, and would throw NPE when parceling a
LinkProperties that did not have a DHCP server.

Add tests and fix the bug.

Bug: 134098566
Test: unit test now passes
Change-Id: If28f0be650963e8d9af7eb53f6940824582a2db3
 2020-01-07 13:02:32 +09:00
Automerger Merge Worker
646bdf8e89 Merge "Convert some users of Time.format() to an alt." am: 267b83e7d6 am: 1b0c2fcd3b 
Change-Id: I1cb9722000898c9d1a7d479e9b0d88f717c57414
 2020-01-07 03:25:07 +00:00
Allen Su
1b0c2fcd3b Merge "Convert some users of Time.format() to an alt." 
am: 267b83e7d6

Change-Id: Ide4b3813fe9666259f4e94462f89c1683d2ba6ed
 2020-01-06 19:09:57 -08:00
Allen Su
267b83e7d6 Merge "Convert some users of Time.format() to an alt." 2020-01-07 02:28:15 +00:00
Automerger Merge Worker
cccf7a2b84 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" am: 2ada7fbac2 am: b128b793c7 
Change-Id: Icee2c41d635883c6b9ede6bf6ec3bbfda22cdc1f
 2020-01-07 01:01:54 +00:00
Hall Liu
b128b793c7 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" 
am: 2ada7fbac2

Change-Id: Ie4ca7c239295ba9e3bfb60815ca5c7d65bf0fdc1
 2020-01-06 16:45:17 -08:00
Hall Liu
2ada7fbac2 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" 2020-01-07 00:36:51 +00:00
Automerger Merge Worker
3db9e958ab Merge "Create new APIs for overriding APNs" am: 13beb87783 am: 4d1771a3fb 
Change-Id: I202aa723edabdca84eddb679233ac0dcf6cfacd2
 2020-01-07 00:10:24 +00:00
Hall Liu
4d1771a3fb Merge "Create new APIs for overriding APNs" 
am: 13beb87783

Change-Id: I523c37c06cb7636775131720c252f06cb2eb152f
 2020-01-06 16:02:13 -08:00
Hall Liu
13beb87783 Merge "Create new APIs for overriding APNs" 2020-01-06 23:14:44 +00:00
Automerger Merge Worker
ec776dfda9 Merge "Add new permissions" am: 62ace8c46a am: c0f9b27214 
Change-Id: I2114c613729f0d84d773b7e8b58402cda302a8c8
 2020-01-06 21:20:53 +00:00
Neil Fuller
c0f9b27214 Merge "Add new permissions" 
am: 62ace8c46a

Change-Id: I618e2f4a608914d1bf679186880cd358a75a238d
 2020-01-06 13:02:34 -08:00
Neil Fuller
62ace8c46a Merge "Add new permissions" 2020-01-06 19:38:25 +00:00
Automerger Merge Worker
fe03e4c510 docs: Fix typo in IMPORTANCE_SERVICE description am: 08a4e470b8 am: edcfda720b am: fc94ebae09 
Change-Id: I24a825364458eafd6d101d47a1cd467d7401cc42
 2020-01-06 18:41:36 +00:00
Automerger Merge Worker
fc94ebae09 docs: Fix typo in IMPORTANCE_SERVICE description am: 08a4e470b8 am: edcfda720b 
Change-Id: Id0683ebab467f7baaac1650b15dd8e98f8057306
 2020-01-06 18:24:58 +00:00
Automerger Merge Worker
edcfda720b docs: Fix typo in IMPORTANCE_SERVICE description am: 08a4e470b8 
Change-Id: I32360f63be584c4223c6aae692beb48c0bdf4802
 2020-01-06 18:13:01 +00:00
ruibin zhang
ad2689c1a1 Add the DHCP server address to LinkProperties. 
Bug: 134098566
Test: see subsequent CL in topic
Change-Id: If0f80067934189137c87cd379e7ae47b187562fd
 2020-01-07 01:21:07 +09:00
Hall Liu
39839dc63b Create new APIs for overriding APNs 
Create new APIs in TelephonyManager for DevicePolicyManager to add
override APNs, and use them in DevicePolicyManagerService instead of
directly accessing the APN database.

Bug: 146834818
Test: cts-tradefed run cts --module DevicePolicyManager --test
com.android.cts.devicepolicy.DeviceOwnerTest#testOverrideApn
Test: atest TelephonyManagerTest

Change-Id: I6c6214424169c05fd452db71a8c6593f8473b9d4
Merged-In: I6c6214424169c05fd452db71a8c6593f8473b9d4
 2020-01-05 14:24:22 -08:00
Kevin Hufnagle
08a4e470b8 docs: Fix typo in IMPORTANCE_SERVICE description 
Test: make ds-docs -j32

Bug: 140783404

Change-Id: Ife86109eebefe9c87f7c9ed4a0587676e3392d90
Exempt-From-Owner-Approval: Docs-only change
 2020-01-03 20:05:31 +00:00
TreeHugger Robot
a7707c4db7 Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master 2020-01-03 17:50:01 +00:00
Automerger Merge Worker
bbce9e0c5a Merge "Use ro.product.vndk.version for unbundled product apks" am: cbfcd44f68 am: e0e165f06e 
Change-Id: I6507b31c3a1b36830a231064e560d978b9427f5c
 2020-01-03 07:36:52 +00:00
Justin Yun
e0e165f06e Merge "Use ro.product.vndk.version for unbundled product apks" 
am: cbfcd44f68

Change-Id: I49b3841f627a6e8b25e91e02dce491cb526886d9
 2020-01-02 23:18:04 -08:00
Treehugger Robot
cbfcd44f68 Merge "Use ro.product.vndk.version for unbundled product apks" 2020-01-03 07:10:01 +00:00
Automerger Merge Worker
6dfd9358a3 Merge "Prevent double-counting of kernel stack size in dumpsys reports" am: 9493f0ed0b am: a457a78ab7 
Change-Id: I5454c8a0c92bd8b25956cf96b987199fffe3a898
 2020-01-03 01:15:50 +00:00
Suren Baghdasaryan
a457a78ab7 Merge "Prevent double-counting of kernel stack size in dumpsys reports" 
am: 9493f0ed0b

Change-Id: If643779ba45321f1dcb5b772ade4de451fcd4e1a
 2020-01-02 17:01:53 -08:00
Suren Baghdasaryan
9493f0ed0b Merge "Prevent double-counting of kernel stack size in dumpsys reports" 2020-01-03 00:18:24 +00:00
Suren Baghdasaryan
2018bf03f9 Prevent double-counting of kernel stack size in dumpsys reports 
When kernel is configured with CONFIG_VMAP_STACK=y kernel stacks are mapped
into process space and therefore already accounted as part of the value
returned by ReadVmallocInfo and reported under MEMINFO_VM_ALLOC_USED
category. Introduce isVmapStack function to check if kernel is configured
with that option and if so do not exclude kernel stack size in the
calculation of memory used by kernel.

Bug: 146088882
Test: dumpsys meminfo with CONFIG_VMAP_STACK enabled and disabled
Change-Id: I9230bbf0ab05524cf52ded35171fd9ec3da16fa0
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
 2020-01-02 13:36:34 -08:00
Xin Li
dd7e1b8a32 DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master 
Change-Id: I2b5667dbbb21f5be830f9338c8cb32d4778ed0c1
 2020-01-02 13:29:43 -08:00
Automerger Merge Worker
588696bef3 Merge "Remove unused BluetoothHearingAid APIs and usages" am: 7d48a4513c am: ed567b8cad 
Change-Id: I75d0d1436fb361152327a6e968d6fb5b5655d9eb
 2020-01-02 21:17:42 +00:00
Rahul Sabnis
ed567b8cad Merge "Remove unused BluetoothHearingAid APIs and usages" 
am: 7d48a4513c

Change-Id: I155dce1eaeb1100f2240041d5604c9252ccc1aae
 2020-01-02 13:01:42 -08:00
Treehugger Robot
7d48a4513c Merge "Remove unused BluetoothHearingAid APIs and usages" 2020-01-02 20:43:57 +00:00
Tobias Thierer
bf7b806fb5 android.net: Update OWNERS. 
Remove flooey@, add prb@ and dauletz@.

Bug: 147092934
Test: Treehugger
Change-Id: I1bdcaf6a2ad3aa66aff23d3488e9426b6d29d29e
 2020-01-02 17:09:10 +00:00
Justin Yun
1ef374f98b Use ro.product.vndk.version for unbundled product apks 
Instead of using "ro.product.apps.unbundled", use
"ro.product.vndk.version" to determine if product apks are unbundled.
"ro.product.vndk.version" will be defined by
PRODUCT_PRODUCT_VNDK_VERSION. If it is defined, all product apks must
be unbundled.

Bug: 144534640
Bug: 127738095
Bug: 128557860
Test: boot and check logs if product apps are loaded successfully
Change-Id: I6d0f7c20e131dfe12203c63a14e6254a8223893b
 2020-01-02 06:30:02 +00:00
Automerger Merge Worker
e977504e7a Merge "Add an override for getUser in ContextWrapper" am: 5a049f5cf2 am: 5d9fc9340b 
Change-Id: I33223887a6807d2f3caa81df3ead1caa10a015ea
 2020-01-02 06:26:20 +00:00
Paul Hu
5d9fc9340b Merge "Add an override for getUser in ContextWrapper" 
am: 5a049f5cf2

Change-Id: Ia69ca6ab1e5f34ac3ac5a16aff8a45ac92de0f9d
 2020-01-01 22:04:35 -08:00
Paul Hu
5a049f5cf2 Merge "Add an override for getUser in ContextWrapper" 2020-01-02 05:42:27 +00:00
paulhu
5c0f07c4f6 Add an override for getUser in ContextWrapper 
This is to fix an issue when calling getUser for a context that
is different than the context of the current foreground user.
getUser for a ContextWrapper would call the base
class Context#getUser which returns the user of the current foreground
process rather than returning the user of the calling context.

Currently, this is a bug that does not meet the ContextWrapper class Javadoc.
It looks like the ContextWrapper call was missed in Ib772ec4438e57a2ad4950821b9432f9842998451.

Fix: 144024489
Test: called the API from a test App with a different context than the
current application context.

Change-Id: I58ec9fda24bf135ba8c648a905ef0c81d36ea098
Merged-In: I2d24f5141e8cbc2546c8dc5894a1aeab376b7632
(cherry-pick from ag/9673528)
 2020-01-02 02:09:45 +00:00