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

107798 Commits

Author SHA1 Message Date
Automerger Merge Worker
ee991b5502 Merge "Add error code for BluetoothDevice#getBatteryLevel to represent Bluetooth is off" am: 1bb18d83eb am: 4e85f7bb92 
Change-Id: Ibc00e82d638cc4307c4356adb79cb7a92c3b70bc
 2020-03-10 21:02:08 +00:00
Automerger Merge Worker
4e85f7bb92 Merge "Add error code for BluetoothDevice#getBatteryLevel to represent Bluetooth is off" am: 1bb18d83eb 
Change-Id: I6b99985c7ee2eb9a9b388dd5270365271a380ced
 2020-03-10 17:47:29 +00:00
Treehugger Robot
1bb18d83eb Merge "Add error code for BluetoothDevice#getBatteryLevel to represent Bluetooth is off" 2020-03-10 17:28:27 +00:00
Automerger Merge Worker
6ce7d57099 Merge "Allow overriding disabled changes in final release." am: 43fe983a6b am: f20124b610 
Change-Id: I0329091565637638aa114772239c8c670bb9e482
 2020-03-10 13:43:54 +00:00
Automerger Merge Worker
f20124b610 Merge "Allow overriding disabled changes in final release." am: 43fe983a6b 
Change-Id: I1fb776743125717d6bec8ceacc89a4c3f82f35d5
 2020-03-10 13:27:50 +00:00
Anna Trostanetski
43fe983a6b Merge "Allow overriding disabled changes in final release." 2020-03-10 13:11:41 +00:00
Automerger Merge Worker
3138b1c662 Merge "Add option to toggle all changes" am: 77d832b12d am: 88eb11eab5 
Change-Id: I2cd97c5377b412e717fb027ee0fc35e9e8db6261
 2020-03-10 12:43:50 +00:00
Automerger Merge Worker
88eb11eab5 Merge "Add option to toggle all changes" am: 77d832b12d 
Change-Id: I41350c137e1eb3967d697aaa1b4d64fbd6a8a217
 2020-03-10 12:29:15 +00:00
Andrei-Valentin Onea
77d832b12d Merge "Add option to toggle all changes" 2020-03-10 12:12:45 +00:00
Automerger Merge Worker
a62e71deb0 Merge "Fixed DisplayCutout flaky test" am: 74c6a9785a am: d4d4909f67 
Change-Id: Ieca8e0b4dd8303ec209836b6b2e65c768ac00c38
 2020-03-10 07:17:44 +00:00
Automerger Merge Worker
d4d4909f67 Merge "Fixed DisplayCutout flaky test" am: 74c6a9785a 
Change-Id: I0c63c50aa2a492decd0223e2b634766bc517976c
 2020-03-10 06:58:00 +00:00
Shawn Lin
74c6a9785a Merge "Fixed DisplayCutout flaky test" 2020-03-10 06:35:51 +00:00
shawnlin
a62e449f6b Fixed DisplayCutout flaky test 
The root cause is that only the top cutout spec was cached.

Now cache the full spec string.

Bug: 145983914
Test: atest android.view.DisplayCutoutTest#fromSpec_setsSafeInsets_top_and_bottom, android.view.DisplayCutoutTest#fromSpec_setsSafeInsets_top -- --abi x86
Test: atest DisplayCutouTest, ScreenDecorationTest
Change-Id: I21ef26e5453412ec659b1d05798b61f04c3d660b
Merged-In: I1d5663ebd8588021387b7ae5296851769954f996
 2020-03-10 11:28:27 +08:00
Automerger Merge Worker
0577ff4687 Merge "SystemConfig: Allow runtime differentiation of vendor configurations" am: 8629072a6f am: 0fd9b2e01f 
Change-Id: I69d8599872c9eaf63a15bd26a5e65d6af394185d
 2020-03-09 20:26:02 +00:00
Automerger Merge Worker
0fd9b2e01f Merge "SystemConfig: Allow runtime differentiation of vendor configurations" am: 8629072a6f 
Change-Id: Ic058ebe60981b180ae68a440ed37207c46ffc791
 2020-03-09 20:15:03 +00:00
Treehugger Robot
8629072a6f Merge "SystemConfig: Allow runtime differentiation of vendor configurations" 2020-03-09 20:08:55 +00:00
atrost
6edc7c37ec Allow overriding disabled changes in final release. 
Since disabled changes are disabled by default, our policy should allow
opting in to them in the final release.
Add toString to OverrideAllowedState for easier test debugging.

Test: atest com.android.server.compat.OverrideValidatorImplTest
Bug: 144552011
Change-Id: Iff01ee44d30d3e5703a980cddaf1b38435756c3c
Merged-In: Iff01ee44d30d3e5703a980cddaf1b38435756c3c
 2020-03-09 20:00:29 +00:00
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
Rahul Sabnis
ded588641b Add error code for BluetoothDevice#getBatteryLevel to represent 
Bluetooth is off

Bug: 147428695
Test: Manual
Change-Id: I07c2fa49954632da6aa6a93706883e4cdfd32fa6
 2020-03-06 18:04:15 -08: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