Commit Graph

97576 Commits

Author SHA1 Message Date
Automerger Merge Worker
8dbd8eaef2 Merge "Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline" am: d301f3fd8e am: b3720cd31c
Change-Id: I73a56d811f4c3ba581298852bbec638b16b510b6
2020-03-10 23:35:25 +00:00
Automerger Merge Worker
b3720cd31c Merge "Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline" am: d301f3fd8e
Change-Id: I84bf9ea55419147e2ee414b0451415ed5a40575c
2020-03-10 23:18:40 +00:00
sqian
9799e6e810 Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline
Test: treehugger
Bug: 147381728
Bug: 138545688
Change-Id: Ieef1dbbab3b05fc166c3dbc53ed2507ef45d09d7
Merged-In: Ieef1dbbab3b05fc166c3dbc53ed2507ef45d09d7
(cherry picked from commit b9c9bfa6e8)
2020-03-10 21:29:32 +00:00
Automerger Merge Worker
5a39a31195 Merge "Update permissions of BluetoothPan System APIs and re-hide some APIs that do not need to be System APIs." am: 365caf6f04 am: a05c58f38d
Change-Id: If3f39232791969764c6bb7060404609180314684
2020-03-10 21:07:54 +00:00
Automerger Merge Worker
a05c58f38d Merge "Update permissions of BluetoothPan System APIs and re-hide some APIs that do not need to be System APIs." am: 365caf6f04
Change-Id: Ie43c36ad4012191ddac47f824014150bb0afce7d
2020-03-10 21:02:56 +00:00
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
Treehugger Robot
365caf6f04 Merge "Update permissions of BluetoothPan System APIs and re-hide some APIs that do not need to be System APIs." 2020-03-10 19:13:52 +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
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
Rahul Sabnis
d479374757 Update permissions of BluetoothPan System APIs and re-hide some APIs
that do not need to be System APIs.

Bug: 146045934
Test: Manual
Change-Id: Ic6325fde05294eb0266fee25f4b3e7098749a287
2020-03-09 16:58:34 -07: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
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
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
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