drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,502 Commits 1 Branch 0 Tags
Commit Graph

653502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
550f4dd9a0 Merge "Update API docs for InCallService." am: 733dd0f1e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818366

Change-Id: I54c94567fa6677f1cfe2ca818c889275d8cb6f1c
 2021-09-07 17:50:40 +00:00
Brad Ebinger
00a839da5a Merge "Clarify that dialed numbers are unformatted." am: b494e43d1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818365

Change-Id: Iefd6aaeb23e86f972482dc072611747018f9dc48
 2021-09-07 17:50:06 +00:00
Brad Ebinger
733dd0f1e9 Merge "Update API docs for InCallService." 2021-09-07 17:28:24 +00:00
Brad Ebinger
b494e43d1f Merge "Clarify that dialed numbers are unformatted." 2021-09-07 17:27:55 +00:00
Treehugger Robot
55d23401db [automerger skipped] Merge "Add suppressLintAnnotation on state.java" am: 0fa9d2ef6b -s ours 
am skip reason: Merged-In I02aa127e8e07f239561f4f2a3bbdfc6fccb82f7f with SHA-1 4acdb1beff is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818911

Change-Id: Icf68f1065dcb10b93d4ad984bcc9d7c1964a9bfa
 2021-09-07 16:09:09 +00:00
Treehugger Robot
0fa9d2ef6b Merge "Add suppressLintAnnotation on state.java" 2021-09-07 15:51:39 +00:00
wescande
4d65834880 Add suppressLintAnnotation on state.java 
Test: Build
Merged-In: I02aa127e8e07f239561f4f2a3bbdfc6fccb82f7f
Change-Id: I5a22ebe6473fbf38494e20d629e763c331b1e1e6
 2021-09-07 16:43:09 +02:00
Treehugger Robot
26531301a0 Merge "create library for mainline module" am: c59870928e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: I048c27593314c00706f29db19b6d20ed4b899ae2
 2021-09-07 14:00:18 +00:00
Treehugger Robot
c59870928e Merge "create library for mainline module" 2021-09-07 13:42:50 +00:00
William Escande
a6fb9459cc create library for mainline module 
This library is a temporary work to link all mainline module using
statemachine.
Once this is done, we will be able to move the library to
frameworks/libs/modules-utils

also fix some typo in state* files

Bug: 198418216
Tag: #refactor
Test: None
Change-Id: I1bec7c7bdb25bf3397a742a356aa1f18fddf7d89
 2021-09-06 15:28:09 +00:00
Bernardo Rufino
82a0a22b30 Merge "Don't throw for LazyValue in Parcel.hasFileDescriptors()" am: 6ae29f70d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818898

Change-Id: Ie6cb56a29e544e50803144a4ac533c29f35d6c06
 2021-09-06 10:31:57 +00:00
Bernardo Rufino
6ae29f70d7 Merge "Don't throw for LazyValue in Parcel.hasFileDescriptors()" 2021-09-06 10:12:59 +00:00
Aaron Huang
019af98809 Merge "Use bindServiceAsUser to bind PacService and ProxyService" am: f1edc162c4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782427

Change-Id: Id4a46874c74dfac4bf90c35b23096f1ed39074cd
 2021-09-06 09:50:36 +00:00
Aaron Huang
f1edc162c4 Merge "Use bindServiceAsUser to bind PacService and ProxyService" 2021-09-06 09:01:58 +00:00
Bernardo Rufino
c087f62482 Don't throw for LazyValue in Parcel.hasFileDescriptors() 
In aosp/1819733 we extracted Parcel.hasFileDescriptor() for types
produced by Parcel.writeValue() and consumed by Parcel.readValue() out
of Bundle into Parcel. It's supposed to handle LazyValue too.

However, we put a check to verify that it was a type supported by
readValue()/writeValue() by retrieving the VAL_XXX type of the value via
Parcel.getValueType(), however, that method throws for LazyValue since
we don't actually write that special type on the wire. However, we still
want Parcel.hasFileDescriptor() to support it, so moving the check into
a last 'else' statement, making sure we don't throw in case the value is
a LazyValue.

Bug: 195622897
Bug: 198433827
Test: atest CtsNetTestCases android.net.cts.CaptivePortalTest#testCaptivePortalIsNotDefaultNetwork
Change-Id: I1e6ec122557c12e74db6890e1631fec3cefe31f6
 2021-09-06 08:51:21 +01:00
Kalesh Singh
ea40b56458 [automerger skipped] Merge "PowerManagerService: Use AIDL Suspend HAL" am: 90f00d947d -s ours 
am skip reason: Merged-In I338804d98fea32bf5481a335a77484c1418e1b82 with SHA-1 9ce1be0f03 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773451

Change-Id: I35f7274b9fe572b2c159d2a90c9c11727f4671d6
 2021-09-03 21:34:22 +00:00
Kalesh Singh
90f00d947d Merge "PowerManagerService: Use AIDL Suspend HAL" 2021-09-03 21:13:53 +00:00
Sarah Chin
f7c3c35090 [automerger skipped] Merge "Rename SliceInfo to NetworkSliceInfo." am: ebcd8db8ef -s ours 
am skip reason: Merged-In Id49bb7122084b08cad78ffd4dd60d7b616d37038 with SHA-1 f71b3611cc is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1817685

Change-Id: I810757e59e729845c9aed2dcfe0d56d16dbf9d27
 2021-09-03 21:11:12 +00:00
Tyler Gunn
84421d74db Update API docs for InCallService. 
Clarify that InCallService implementations should never indicate that they
are non-exported.

Test: Docs only fix
Bug: 198003282
Change-Id: I85f925775b12c994a028e14d7644c744a252ec33
 2021-09-03 14:05:37 -07:00
Sarah Chin
ebcd8db8ef Merge "Rename SliceInfo to NetworkSliceInfo." 2021-09-03 20:55:52 +00:00
Tyler Gunn
bcadfe0cd5 Clarify that dialed numbers are unformatted. 
Adding docs clarification so ImsService impls know they need to format
the dialed numbers to E164 or whatever format is required for SIP
message generation.

Test: Docs only change
Fixes: 198818889
Change-Id: Icac9e7e120c83f179f65adb54b87ca224e9b4f71
 2021-09-03 13:53:21 -07:00
Jakub Pawlowski
498ce864ec [automerger skipped] Merge "le_audio: Introduce connection state handling for LE Audio group" am: fe2fd0e0ad -s ours 
am skip reason: Merged-In I11222ca07e265ac8b6dc3c21650874ebeffa473c with SHA-1 59b2baa872 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708486

Change-Id: I563233bbff25971587cc9df77969afacbe41e61a
 2021-09-03 20:24:25 +00:00
Jakub Pawlowski
fe2fd0e0ad Merge "le_audio: Introduce connection state handling for LE Audio group" 2021-09-03 20:03:15 +00:00
Amit Mahajan
55f3179ce6 Rename SliceInfo to NetworkSliceInfo. 
Test: build
Bug: 178498823
Change-Id: Id49bb7122084b08cad78ffd4dd60d7b616d37038
Merged-In: Id49bb7122084b08cad78ffd4dd60d7b616d37038
 2021-09-03 12:27:11 -07:00
Michael Groover
16fd109212 Merge "Update APK sig scheme verification OWNERS" am: 1e5f1a293a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1817421

Change-Id: I763efc9f320e551ca61462699e5f7ac12f6219fc
 2021-09-03 17:25:21 +00:00
Michael Groover
1e5f1a293a Merge "Update APK sig scheme verification OWNERS" 2021-09-03 17:07:40 +00:00
Kalesh Singh
2361703653 Merge "PowerManagerService: Use AIDL Suspend HAL" into stage-aosp-master 2021-09-03 14:58:23 +00:00
Grzegorz Kołodziejczyk
46aba35609 le_audio: Introduce connection state handling for LE Audio group 
Patch implements connection state handling for LE Audio device group.

Tag: #feature
Test: Set LE audio device as active
Sponsor: jpawlowski@
Bug: 150670922
Merged-In: I11222ca07e265ac8b6dc3c21650874ebeffa473c
Change-Id: I11222ca07e265ac8b6dc3c21650874ebeffa473c
 2021-09-03 11:58:32 +00:00
Jakub Pawlowski
2f0430af32 Merge "le_audio: Introduce connection state handling for LE Audio group" into stage-aosp-master 2021-09-03 11:57:28 +00:00
Treehugger Robot
1840c2ded9 Merge "settinglib: add VolumeControl profile for auto-connect" am: 1400c5acc5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810279

Change-Id: If9614369c424fb7557bb51e07754d1262dca873a
 2021-09-02 22:34:57 +00:00
Treehugger Robot
1400c5acc5 Merge "settinglib: add VolumeControl profile for auto-connect" 2021-09-02 22:20:02 +00:00
Christopher Ferris
d2dbb3cb14 Merge "Remove unused libbacktrace library." am: dbd54bdca3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807720

Change-Id: I0c3769ae982f45667191d80eb6b4d0879a908b55
 2021-09-02 21:38:38 +00:00
Christopher Ferris
dbd54bdca3 Merge "Remove unused libbacktrace library." 2021-09-02 21:25:02 +00:00
Michael Groover
9688bab011 Update APK sig scheme verification OWNERS 
Bug: 198670656
Test: Builds
Change-Id: I2dd8de24baf29759a9000213650e4de49d2bb521
 2021-09-02 13:20:14 -07:00
Treehugger Robot
cd21536cd4 Merge "Remove unnecessary ASLR workaround" am: 93f5f96418 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1811856

Change-Id: I178f2bb4459ed57a62893e3d60185a0084edcedf
 2021-09-02 17:25:50 +00:00
Treehugger Robot
93f5f96418 Merge "Remove unnecessary ASLR workaround" 2021-09-02 17:08:20 +00:00
Grzegorz Kołodziejczyk
59b2baa872 le_audio: Introduce connection state handling for LE Audio group 
Patch implements connection state handling for LE Audio device group.

Tag: #feature
Test: Set LE audio device as active
Sponsor: jpawlowski@
Bug: 150670922
Change-Id: I11222ca07e265ac8b6dc3c21650874ebeffa473c
 2021-09-02 18:12:10 +02:00
Treehugger Robot
bdf15f2234 Merge "[services.incremental] Use shared libutils for remount" am: 44233c693c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810680

Change-Id: I2614171ee4fc1822a2a3c1e7e50658487218a34d
 2021-09-01 18:34:47 +00:00
Treehugger Robot
44233c693c Merge "[services.incremental] Use shared libutils for remount" 2021-09-01 18:10:10 +00:00
Jared Duke
d3d8abeb14 Remove unnecessary ASLR workaround 
The ADDR_NO_RANDOMIZE workaround for ASLR is not required for 3.4+
kernels. As Android 11+ requires kernel 4.4+, this workaround can be
safely removed from app startup.

Bug: 193448904
Test: Manual
Change-Id: I3c5517c34176573256176a4753f4a9113a62a49f
 2021-09-01 16:59:13 +00:00
Junyu Lai
538771303d Merge "NetworkStats: Avoid Division By 0" am: e22278838e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810678

Change-Id: I5bdeb5bba3613bc4891ff2c1e108d6f1a334eaad
 2021-09-01 06:19:57 +00:00
Junyu Lai
e22278838e Merge "NetworkStats: Avoid Division By 0" 2021-09-01 06:07:18 +00:00
Treehugger Robot
e654404579 Merge "Add pending list of external source." am: 86806e9ce4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801771

Change-Id: Ifc310e524f4a73029660c3d71b6c62cc91439591
 2021-09-01 04:41:54 +00:00
Treehugger Robot
86806e9ce4 Merge "Add pending list of external source." 2021-09-01 04:29:03 +00:00
Pirama Arumuga Nainar
cebf0493bf [services.incremental] Use shared libutils for remount 
Bug: http://b/197965342

services.incremental depends on libbinder.so, which already depends on
libutils.so.  When linking services.incremental with libutils.a, the
linker tries to open objects from libutils.a to redefine undefined
symbols in libbinder.so.  This causes a linker failure with upstream
LLD.  Switching to shared libutils.so instead doesn't increase the
dependency closure for services.incremental.

Test: build with aosp/1809741 which has lld with the above behavior.
Change-Id: I2735461ae64ef2e4c0afc170f7b765c1b5b9432e
 2021-08-31 21:20:27 -07:00
Jooyung Han
16c2faf6e1 Merge "Revert "AIDL: use typed Map"" am: 01da4566ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806796

Change-Id: Idc267d0189a2efcae7d4e5437e31106aa3a4b3ea
 2021-09-01 00:37:33 +00:00
Jooyung Han
01da4566ee Merge "Revert "AIDL: use typed Map"" 2021-09-01 00:20:02 +00:00
Treehugger Robot
944db95410 Merge "Fix unused-but-set-variable warning" am: 14c914335a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1815077

Change-Id: Ia17fc33e54497d2dd9bf10b9a206967199d596e2
 2021-08-31 19:38:58 +00:00
Treehugger Robot
14c914335a Merge "Fix unused-but-set-variable warning" 2021-08-31 19:20:31 +00:00
Treehugger Robot
542c95130e Merge "Mention the tag to use to bypass the AOSP-first check." am: 7c25a55f5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814778

Change-Id: Iaa9997aafcf6058e83a3d9286ec2bd2015d2efbe
 2021-08-31 19:03:39 +00:00