Commit Graph

6986 Commits

Author SHA1 Message Date
Automerger Merge Worker
251a110c45 DO NOT MERGE: Adds artificial package handler latency am: de626c28d7 am: 895d932835
Change-Id: Icbf1e5c7475260bee1c147f92aa328dd29f4fb17
2020-01-27 20:22:29 +00:00
Automerger Merge Worker
895d932835 DO NOT MERGE: Adds artificial package handler latency am: de626c28d7
Change-Id: I5303926e34c973ca9e4a7d12d0f4cd46e2fbcde8
2020-01-27 20:14:59 +00:00
Automerger Merge Worker
e29d03dbad Merge changes from topic "remove_ce_caching" am: 02e09b98b0
Change-Id: I064eaec6c1c5c056c850b71534b1e768a69a8d3a
2020-01-24 17:16:33 +00:00
Barani Muthukumaran
add57fcc09 Provide secret to vold to remove credential
vold requires the secret to retrieve the CE key
to re-wrap without auth when the user removes
the credential.

Test: Set credential, remove credential, swipe to none
and vice-versa.
Unit tests under locksettings

Bug: 26948053
Merged-In: I14503404ddd330cced2f2ff0e8f500cbe3f96e28
Change-Id: I14503404ddd330cced2f2ff0e8f500cbe3f96e28
2020-01-24 00:43:57 +00:00
Lev Rumyantsev
cbf8e9dd7a AppZygote: start with the correct instruction set
am: 041f016971

Change-Id: I85ed95566f9cb6d38b02619f47e2efe6ebcf9c61
2020-01-21 15:18:34 -08:00
Lev Rumyantsev
5f30976b8c Merge changes from topic "native_bridge_for_app_zygote"
* changes:
  Zygote: support native-bridge for app-zygote
  AppZygote: start with the correct instruction set
2020-01-21 23:09:34 +00:00
Automerger Merge Worker
f184b6b8d6 Merge "Vibrator: Have Always-On Check DND/LowPower Modes" am: 301beddcdb
Change-Id: I7540f05ce7397f83bb62404dcbca6e3e0848444a
2020-01-17 20:05:26 +00:00
Treehugger Robot
301beddcdb Merge "Vibrator: Have Always-On Check DND/LowPower Modes" 2020-01-17 01:39:04 +00:00
TreeHugger Robot
8da97bddbd Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 18:29:18 +00:00
Treehugger Robot
03e365f649 Merge "Improve DSU log and notification message" 2020-01-16 12:15:26 +00:00
Po-Chien Hsueh
bcf2adb424 Improve DSU log and notification message
Improve DSU installation service's status log message. And, use
Notification.BigTextStyle for DSU notification message.

Bug: 132924741
Test: Run DSU installation
Change-Id: I9e821edfeff88a1f4084a005de3e0f4264338996
2020-01-16 13:52:57 +08:00
Howard Chen
69d181aecc Merge "Support multiple DSU installations" 2020-01-16 05:33:10 +00:00
Harpreet \"Eli\" Sangha
9adedac3b9 Vibrator: Have Always-On Check DND/LowPower Modes
Bug: 145961380
Test: Verify always-on settings changes via dumpsys.
Change-Id: I201f04ef1c2bdf7f10961e8c3d9b47cb7a815f11
Merged-In: I201f04ef1c2bdf7f10961e8c3d9b47cb7a815f11
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2020-01-16 02:11:20 +00:00
Xin Li
e13851556b DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
Lev Rumyantsev
041f016971 AppZygote: start with the correct instruction set
This allows triggering native-bridge initialization if needed.

Test: CtsExternalServiceTestCases
android.externalservice.cts.ExternalServiceTest
testBindExternalServiceWithZygote
for Q.sdk_gphone_x86_arm.armeabi-v7a
Bug: 143143718

Change-Id: If105c4283879407c4fcee33fa6086772d43609a3
2020-01-14 17:03:06 -08:00
Neil Fuller
efe063e5dc Expose time / time zone system apis for telephony
Expose system apis / permissions needed by the telephony module to
communicate with the system server for time and time zone detection.

There are also small improvements for @Nullable.

Bug: 147012511
Test: build only
Merged-In: I27e5aa4c594d5fbad0b6f043afb9e910dcba4349
Change-Id: I27e5aa4c594d5fbad0b6f043afb9e910dcba4349
(cherry picked from commit 2be7ac4531)
2020-01-14 19:30:40 +00:00
Howard Chen
c6f64c44eb Support multiple DSU installations
Bug: 144247097
Test: adb shell am start-activity \
        -n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
        -a android.os.image.action.START_INSTALL \
        -d file:///storage/emulated/0/Download/system.raw.gz \
        --el KEY_SYSTEM_SIZE $(du -b system.raw|cut -f1) \
        --el KEY_USERDATA_SIZE 8589934592
Change-Id: Ib2f86039c4c0c1dae2bc94a702721572567bcbf2
2020-01-14 02:20:47 +00:00
Artur Satayev
bc3d8b9071 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: I534e3fd1305e2f4af076986770033478448a665c
Merged-In: I534e3fd1305e2f4af076986770033478448a665c
2020-01-13 12:39:59 +00:00
Automerger Merge Worker
163d3a1e98 Merge "Refine documentation for Process.setThreadPriority" am: fd1985993c am: 32593a60d0
Change-Id: Ia3a5995f2687d7727e6927ea842d9aafe34085f1
2020-01-10 10:20:38 +00:00
Treehugger Robot
fd1985993c Merge "Refine documentation for Process.setThreadPriority" 2020-01-10 09:48:44 +00:00
Automerger Merge Worker
e29b9871d8 Merge "Update system api for applyPayload" am: c8f699d327 am: 8187d5301e
Change-Id: Ib9c8fcd961c301cbf32d2ca57c8914ec96891cbd
2020-01-10 09:19:10 +00:00
Automerger Merge Worker
aa58c0d5c3 Merge "Rename android.util.TimestampedValue to android.os" am: 641fa6730a am: fee904a5fb
Change-Id: Ib439759dbee692a624491267d07f72b0d754779d
2020-01-10 09:18:38 +00:00
Treehugger Robot
c8f699d327 Merge "Update system api for applyPayload" 2020-01-10 08:31:59 +00:00
Neil Fuller
641fa6730a Merge "Rename android.util.TimestampedValue to android.os" 2020-01-10 08:11:14 +00:00
Rick Yiu
c3648a82f1 Refine documentation for Process.setThreadPriority
Add more description for the tid parameter.

Bug: 139521784
Test: compile
Change-Id: I5ccfef865d49207172df301520cf38e942e03e21
2020-01-10 07:51:31 +00:00
Neil Fuller
35cc296228 Rename android.util.TimestampedValue to android.os
Rename android.util.TimestampedValue to android.os to avoid dependency
from android.util onto android.os, which is disallowed by lint.

Bug: 147012511
Test: boot
Merged-In: I4b84db03c8ad24bbef63e45d6d15fb306a10364e
Change-Id: I4b84db03c8ad24bbef63e45d6d15fb306a10364e
(cherry picked from commit d159015e54)
2020-01-09 15:34:43 +00:00
Automerger Merge Worker
e576ba8f8d Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" am: 0104ce5293 am: f5a037d685
Change-Id: I09813d60dacabbd98e395816f9d7cb6d965a4f19
2020-01-09 03:45:21 +00:00
Treehugger Robot
0104ce5293 Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" 2020-01-09 02:48:14 +00:00
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
Philip P. Moltmann
06b07e9e25 (Backport) Pipe through featureId from caller to permission checks in telephony
code

Test: atest FrameworksTelephonyTests CtsAppOpsTestCases
Bug: 136595429
Fixes: 146350559
Change-Id: Ie58007cf2a4e4a39cdfd72822150efce71dfbe84
Merged-In: I7ef41e8961e48d40e5685c4a521e83cb20953e48
2020-01-08 14:16:54 -08: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
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
Yifan Hong
f585f651ad Use @ErrorCode for UpdateEngineCallback
Test: TH

Change-Id: I26297984e40b66ff08e0c291bc1aa0e556fe6bcc
2020-01-03 13:08:46 -08:00
Yifan Hong
8e48e6d986 Add @ErrorCode annotation to UpdateEngine APIs
Test: TH

Change-Id: I3016132454ea38d2eaf69b907c726f46b2608509
2020-01-03 13:08:46 -08:00
Yifan Hong
2ce03276e7 Add UpdateEngine.cleanupSuccessfulUpdate
This API cleans up the merge and free up space after the
device has boot successfully into the new build for a
Virtual A/B update.

Bug: 138808328
Test: pass
Change-Id: Id4543906b06e6a8487f91955af85024d8a50a464
2020-01-03 11:18:04 -08:00
Yifan Hong
16d4554abc Add UpdateEngine.allocateSpace
This API preallocates space for a Virtual A/B update.

Test: pass
Bug: 138808058
Change-Id: I34e34fbf6ac63bd189abda4a45cdac84b0e109d0
2020-01-03 11:18:04 -08: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
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
Automerger Merge Worker
3990bf8ba0 Merge "ServiceManagerProxy: New method implementations" am: b2d8eb58a2 am: b88261b982
Change-Id: Ieef272563ab13c9bad7b7f062f2778bb2a7062d1
2019-12-23 20:22:53 +00:00
Jon Spivack
b2d8eb58a2 Merge "ServiceManagerProxy: New method implementations" 2019-12-23 20:04:33 +00:00
Automerger Merge Worker
afc127664e Log watchdog-initiated rollback reason am: 254b0d5a7f
Change-Id: I2487bca4fd0579c2f66de15da727ada54a26cfe1
2019-12-20 08:18:37 +00:00
Automerger Merge Worker
91bc7be712 Merge "Use sysprop library for telephony props" am: afb16fa9d4 am: dc4de88fec
Change-Id: Iae5ca6c30dd3a72d5da921cf45d9c282bcff2703
2019-12-20 02:22:19 +00:00
Treehugger Robot
afb16fa9d4 Merge "Use sysprop library for telephony props" 2019-12-20 02:00:38 +00:00
Automerger Merge Worker
0b11673991 Merge "Add an API to tell whenever device supports userspace reboot" am: 670352e807 am: d1c0e074c0
Change-Id: I5e51be225c3063e250facec51cf4976c3004acc4
2019-12-20 00:26:24 +00:00
Nikita Ioffe
670352e807 Merge "Add an API to tell whenever device supports userspace reboot" 2019-12-19 23:44:06 +00:00
Automerger Merge Worker
cc628869ff Merge changes from topic "ion memory accounting" am: 5ded8c130c am: 3c4624dcc2
Change-Id: I6620e200357ddcc46557f149e17fcad25e7c57c4
2019-12-19 21:51:13 +00:00
Suren Baghdasaryan
5911b9ef0a Add JNI API to query sizes of ION heaps, pools and mapped part of the heaps
Provide means for system_server to query ION memory usage. The new API
allows to get total size of ION heaps, pools and part of ION heaps that
is mapped into user space.

Bug: 138148041
Test: dumpsys meminfo
Change-Id: I6d76d534bbab5ee1646e8e3e3fe5210dcf76bc23
Merged-In: I6d76d534bbab5ee1646e8e3e3fe5210dcf76bc23
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-12-19 19:48:42 +00:00
Automerger Merge Worker
b4e26195e3 Merge "Delete VINTF compatibility checks during OTA." am: bdc465991f am: 8ca8a6d00d
Change-Id: I9d0a3698b096ec66604403f405d73c4f112f689e
2019-12-19 19:16:28 +00:00