Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
445,387 Commits 3 Branches 0 Tags
80a2d6d71276e793cecfd99ca25720aa6b06b5c3
Commit Graph

107778 Commits

Author SHA1 Message Date
Automerger Merge Worker
80a2d6d712 Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" am: ea11eb2a5d am: c62583fb4f 
Change-Id: Ic267cbaa41cd22d76920ccdc4d0ad3596311de82
 2020-03-09 14:26:45 +00:00
Automerger Merge Worker
c62583fb4f Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" am: ea11eb2a5d 
Change-Id: Ic23d24ea6f2d62fb1131ba22d3f0892fdf39e90f
 2020-03-09 14:15:29 +00:00
Hugo Benichi
ea11eb2a5d Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" 2020-03-09 14:12:06 +00:00
Automerger Merge Worker
25449f2468 Merge "Sync android.timezone / libcore.timezone" am: 18ad0ea8ff am: ebed5f7ae0 
Change-Id: I00f8a242bcac5f0839d0f1844345bf7f16b353ea
 2020-03-09 13:26:39 +00:00
Automerger Merge Worker
ebed5f7ae0 Merge "Sync android.timezone / libcore.timezone" am: 18ad0ea8ff 
Change-Id: Iad7e84d4ab9ff34370e9cff334871f72c33c9187
 2020-03-09 13:06:08 +00:00
Neil Fuller
18ad0ea8ff Merge "Sync android.timezone / libcore.timezone" 2020-03-09 12:46:52 +00:00
Automerger Merge Worker
8ed4c1d21a Merge "Reduce log size from CountryTimeZones" am: 56ebd31787 am: 19dc1fb0e0 
Change-Id: I4cff6aced0eb36f0eb13215e1e2930be8eabac7e
 2020-03-09 12:35:52 +00:00
Automerger Merge Worker
19dc1fb0e0 Merge "Reduce log size from CountryTimeZones" am: 56ebd31787 
Change-Id: I3c7022d20e66b435db09b11fcc521bd02e0a254b
 2020-03-09 12:23:35 +00:00
Neil Fuller
56ebd31787 Merge "Reduce log size from CountryTimeZones" 2020-03-09 12:06:31 +00:00
Automerger Merge Worker
6d9caebdc9 Merge "Add support for LoggingOnly changes" am: 33e09a3630 am: 6fafeff7a5 
Change-Id: Ic3011fcd8432ffece70d03755b87117f1b74c25f
 2020-03-09 11:17:46 +00:00
Automerger Merge Worker
6fafeff7a5 Merge "Add support for LoggingOnly changes" am: 33e09a3630 
Change-Id: I9b37f01dc0a6ab82de71d22f1fb34b8bc70cd619
 2020-03-09 11:05:26 +00:00
Anna Trostanetski
33e09a3630 Merge "Add support for LoggingOnly changes" 2020-03-09 10:53:02 +00:00
Neil Fuller
06795ef740 Reduce log size from CountryTimeZones 
ICU's TimeZone.toString() prints out too much information. Only the ID
is useful.

Bug: 149014708
Test: build only
Change-Id: I7d633f7946f82696e13dbc39749b6f9f44f83fa3
 2020-03-09 10:11:36 +00:00
Automerger Merge Worker
26e43b6346 Merge "Add missing RequiresPermission to EthernetManager" am: b3d7fe48ad am: 360c24f950 
Change-Id: I82aa6c27748dab5835158f4a64c3d8efbc8e28b4
 2020-03-09 08:24:38 +00:00
Automerger Merge Worker
360c24f950 Merge "Add missing RequiresPermission to EthernetManager" am: b3d7fe48ad 
Change-Id: I4263c0f0d315c6252eea921641c00fcd8d0e66cf
 2020-03-09 08:12:48 +00:00
Remi NGUYEN VAN
b3d7fe48ad Merge "Add missing RequiresPermission to EthernetManager" 2020-03-09 07:42:25 +00:00
Remi NGUYEN VAN
bb5104fa13 Add missing RequiresPermission to EthernetManager 
The method requires NETWORK_STACK or MAINLINE_NETWORK_STACK permissions,
but the annotation was missing.

Test: m
Fixes: 150877670
Change-Id: I2af74cbcfa642f05f5e7bf85b2a8e8c38595f6ca
 2020-03-09 14:18:55 +09:00
Hugo Benichi
980693da91 vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set 
Bug: 150910582
Test: Compiled bertha_x86_64-userdebug (Chrome OS ARCVM image) for
rvc-dev, flashed eve-arcvm (Pixelbook), connected TouchVpn App, observed
that ARC's VpnTracker does not crash the system server when printing
VpnConfig objects with no ProxyInfo.

Merged-In: I3f8dd1d232e2b18dae9e99eb05c92a797a2358b9
Change-Id: I3f8dd1d232e2b18dae9e99eb05c92a797a2358b9
(cherry picked from commit c8922177c8)
 2020-03-09 10:07:17 +09:00
Automerger Merge Worker
f641635b60 Merge "Remove the NetworkScore class." am: d1edb37ac7 am: 709ec7c707 
Change-Id: I4afcb386d3432872e4a9698db4f7652ada0d9702
 2020-03-08 05:26:32 +00:00
Automerger Merge Worker
709ec7c707 Merge "Remove the NetworkScore class." am: d1edb37ac7 
Change-Id: Ieb78467dac3aca48eea9d049b83a74f9ff41eec7
 2020-03-08 05:11:03 +00:00
Treehugger Robot
d1edb37ac7 Merge "Remove the NetworkScore class." 2020-03-08 04:52:26 +00:00
Automerger Merge Worker
b17d9e2c5a Merge "Identity Credential: Apply changes identified in API review." am: e3643bcb6e am: 3ff7ba66fc 
Change-Id: I5bbfdf1ccb0469683d57366a18485aed79b0c758
 2020-03-07 13:16:55 +00:00
Automerger Merge Worker
3ff7ba66fc Merge "Identity Credential: Apply changes identified in API review." am: e3643bcb6e 
Change-Id: Ia22a4ec0321c16967e8e58c0b5e80c436857c919
 2020-03-07 13:05:03 +00:00
Treehugger Robot
e3643bcb6e Merge "Identity Credential: Apply changes identified in API review." 2020-03-07 12:56:05 +00:00
David Zeuthen
7c7d90b8c6 Identity Credential: Apply changes identified in API review. 
Bug: 150817385
Test: atest android.security.identity.cts
Change-Id: I4e005fa7a81ef363a80278224bb706441dad2241
 2020-03-06 15:49:57 -05:00
Neil Fuller
e2c60dc6ab Sync android.timezone / libcore.timezone 
Track changes in libcore/

Bug: 148086409
Test: treehugger
Change-Id: I0aadc51e58eb5cc4ffca938429d5f31c0bc77edb
 2020-03-06 20:10:03 +00:00
Automerger Merge Worker
3269ed8d76 Merge "Teaches the ProcessCpuTracker about USAPs." am: 3bc5168281 am: 1ccb15b7d3 
Change-Id: I8a98b1ed35ed271f17e8dd9059a1b222aa6b0ad1
 2020-03-06 18:35:02 +00:00
Automerger Merge Worker
1ccb15b7d3 Merge "Teaches the ProcessCpuTracker about USAPs." am: 3bc5168281 
Change-Id: I26851e3f263dafbe2d39e2859f7765e0f21e4e3b
 2020-03-06 18:24:10 +00:00
Christian Wailes
3bc5168281 Merge "Teaches the ProcessCpuTracker about USAPs." 2020-03-06 18:11:53 +00:00
Automerger Merge Worker
79a6a980f6 Merge "Adds Zygote policy flags to control how applications are launched" am: 335db814a5 am: 18fd9af1af 
Change-Id: I75ecb13c426316ddbf0262f0bc41281365a1524d
 2020-03-06 14:03:07 +00:00
Automerger Merge Worker
18fd9af1af Merge "Adds Zygote policy flags to control how applications are launched" am: 335db814a5 
Change-Id: If9e8d168e47f4d651ff212a004140e1cefc44a0c
 2020-03-06 13:50:05 +00:00
Treehugger Robot
335db814a5 Merge "Adds Zygote policy flags to control how applications are launched" 2020-03-06 13:34:33 +00:00
Aaron Huang
aa078c03c4 Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master 2020-03-06 05:53:20 +00:00
Chalard Jean
36b29acbc5 Remove the NetworkScore class. 
This class is useless at this point and introduces overhead.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ib6da6c1c7f2a0b97c847d2e64e5ce16dd821e1e7
 2020-03-06 11:57:53 +09:00
Automerger Merge Worker
cea8b633f9 Merge "Clarify getCallingPid for oneway transactions." am: 26bbd81bd6 am: 79e3174053 
Change-Id: I3e06faac78e6d864f1514876f4eb54fb7a522da5
 2020-03-06 00:42:15 +00:00
Automerger Merge Worker
1b8e99699a Merge "Remove polling of TetheringManager in ConnectivityManager." am: 7ced7df125 am: c1314bb84f 
Change-Id: I1ab97f3dfff583690fcdeb1097a40253a80af3cc
 2020-03-06 00:38:40 +00:00
Steven Moreland
26bbd81bd6 Merge "Clarify getCallingPid for oneway transactions." 2020-03-05 20:48:07 +00:00
Steven Moreland
61c5f8e68b Clarify getCallingPid for oneway transactions. 
Seems this frequent gotcha is not documented here.

Bug: N/A
Test: N/A
Change-Id: Ia186cd8b9945b75b8342b0750713d8667cfef064
 2020-03-05 19:20:37 +00:00
Automerger Merge Worker
dc54349a7f Merge "Add command line support for testing tz detection" am: 86fd801bff am: 215eafabf2 
Change-Id: I664351b715614c6816e033ea091c5d8b74d09643
 2020-03-05 18:41:14 +00:00
Amos Bianchi
7ced7df125 Merge "Remove polling of TetheringManager in ConnectivityManager." 2020-03-05 18:34:59 +00:00
Amos Bianchi
b118c9b72b Remove polling of TetheringManager in ConnectivityManager. 
Test: manual

Bug: 144742179

Change-Id: I196b320788be96c120f771d2fcdf032a73e26b5f
 2020-03-05 18:34:14 +00:00
Automerger Merge Worker
215eafabf2 Merge "Add command line support for testing tz detection" am: 86fd801bff 
Change-Id: Ia1060d6120c3572dc74a47256e1a1735aef08dbd
 2020-03-05 18:23:04 +00:00
Bill Yi
020c84a136 Merge stage-aosp-master to aosp-master - DO NOT MERGE 
Change-Id: I352ed2cba25df69594ee5861f3a64be63bc18c96
 2020-03-05 10:20:17 -08:00
Neil Fuller
86fd801bff Merge "Add command line support for testing tz detection" 2020-03-05 18:07:24 +00:00
Automerger Merge Worker
bda3645a88 Merge "UpdateEngine: fix cleanupAppliedPayload impl" am: 54aba47b29 am: a339e2def4 
Change-Id: Ia0243dcb9185d2b7c53429d5a5312e3a9065ddea
 2020-03-05 17:17:10 +00:00
Automerger Merge Worker
a339e2def4 Merge "UpdateEngine: fix cleanupAppliedPayload impl" am: 54aba47b29 
Change-Id: I9ff3ddc4dbf17d8d6401fc7c14ee8b16d7aafb2b
 2020-03-05 17:00:50 +00:00
Yifan Hong
54aba47b29 Merge "UpdateEngine: fix cleanupAppliedPayload impl" 2020-03-05 16:41:16 +00:00
Aaron Huang
04b394d07b Remove framework code that has moved to frameworks/libs/net 
Add srcs to framework and change import path.
Remove the codes which are moved to frameworks/libs/net.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I44e0a8361637c2d43be2e5d033d405b22e1a149c
Merged-In: I067cdc404e5a63947c19cb75069a39ae42faa3c8
Merged-In: Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef
 2020-03-05 13:53:39 +08:00
Automerger Merge Worker
2ee8512bfa Merge "Start process of next activity with top priority in advance" am: efbcd6752d am: 627bfca085 
Change-Id: Ifb4da995dab885689f50dcf9890e64f8082194b0
 2020-03-05 00:05:36 +00:00
Automerger Merge Worker
627bfca085 Merge "Start process of next activity with top priority in advance" am: efbcd6752d 
Change-Id: I8e8dd0f20cd3a783e49468a7657e571812bca3eb
 2020-03-04 23:54:10 +00:00