Age | Commit message (Collapse) | Author |
|
mainline-go-mediaprovider-release
Change-Id: I04ea0d2786372b57ebdfd99fe001a2b7bae22d67
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19135348
Change-Id: I13e65ad18fa82c1621f3177667f587959c2b582b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
mainline-go-mediaprovider-release
Change-Id: Ided24a9007eba1147a7a0586dff36159a0a4ecf7
|
|
Prior to this change, native work sources didn't read or write any
information concerning WorkChains, but Java ones did. This lead to a
mismatch when Java code, such as PowerManagerService, unparceled the
WorkSource as it read the whatever the next 4 bytes happened to be as
the WorkChain count, but it was actually reading whatever the next item
in the transaction happened to have written.
Note that this change does _not_ attempt to add a WorkChain
implementation to native. It instead makes it so that WorkSources
written from native to Java, or Java to native with no WorkChains, are
correctly and symmetrically parceled. In addition, if a Java WorkSource
is sent to native with a non-zero amount of WorkChains associated, then
it will return an error when unparceling rather than continuing but
leaving in the Parcel in an undefined state.
Bug: 234429395
Test: atest WorkSourceTest.cpp
Test: Write sample native app that grabs wakelock, validate display ID
Change-Id: Id1a5f29f4ccf2996e37ec99014ce392599b6b725
|
|
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 8b1dd38bd7 -s ours am: fbceef0329 -s ours am: b8091bc399 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: I6330277cd00a8cf6ef6859922ebdf72a4dafdabc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 8b1dd38bd7 -s ours am: fbceef0329 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: I3a856100d06f1286def71626a3a4601cd8d1d34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 35ec750a23 -s ours am: 118101fd6f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: I31dceda61e6ee1902d5719010c3085bd4c5a7a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 8b1dd38bd7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: I0822d80b662805d487867caa2ad0c711e58640d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours am: 35ec750a23 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: Iba8bd3eaebbb668021c46fa13c7edb8d6c3a0536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
NOT MERGE" into sc-dev am: 201f54d7c6 am: f076e073eb -s ours am: 034f4efd98 -s ours am: 452bd0d954 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I9110cc10e51c6d7c8597d990cccf6d0706ea8514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: 4c0e43192b am: 4563b6a255 -s ours am: 7052ac032a -s ours am: db014e3087 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: Ia0b19fed88fd23bc459a47969cd7277321e43b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: I62851820f6e4f3fe1fae92a4e14f3c6455e4392f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
NOT MERGE" into sc-dev am: 201f54d7c6 am: f076e073eb -s ours am: 034f4efd98 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: Iac46627c7b943c3a4af52692c439de844bbc8814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: 4c0e43192b am: 4563b6a255 -s ours am: 7052ac032a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I6b2453a7d780790e9fdd4286c099c2bd3950ca77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: c7df484a6f am: 193b8969e5 -s ours am: cde6fd6fd9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: I94528791d372403d992ba019ac31ed0296f98b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
NOT MERGE" into sc-dev am: 201f54d7c6 am: c9912eb5f0 -s ours am: 43837636d7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: Iadf9e639608fe273dd42b1cb110e09ca6aadcc82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: 4c0e43192b am: 2fb2b9b16d -s ours am: 78cdbeccf2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I7f3fa7350f5ee4a22ec0531edd48d19bbd0c25db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
NOT MERGE" into sc-dev am: 201f54d7c6 am: f076e073eb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: If813530a876683027984fcf0e988942d23873a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: 4c0e43192b am: 4563b6a255 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: Ice153b7e1ade56c9626f4ca21582b4747b0d1370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
NOT MERGE" into sc-dev am: 201f54d7c6 am: c9912eb5f0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I93e45af7d6eb4ceed9bca2bcbf78933ecb8062d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: 4c0e43192b am: 2fb2b9b16d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: Ia5d316ccda70dcdb0638c01e2f554c757ef9ab8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
NOT MERGE" into sc-v2-dev am: f5aaf7019d -s ours am: fc81bc567d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622
Change-Id: Idedbc6ef46448ad818e574aaf8de1c629034363b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: 8758cd1030 -s ours am: 16dc9262f9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622
Change-Id: I87818c705e3f68298b5b1da403985a55fc625523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: c7df484a6f am: 193b8969e5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: I968f84be902696f884feb0a4043f8094cfc7e220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 201f54d7c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I722b8a49321f8cb4bfbd37c0836fad52aa87950e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I547653f413b26a7cc44828b9c3e89ecdcca5b203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 201f54d7c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I9f19aa9362ea592c8fc5ba028846d0a7edf90746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I0f8e82ad59e55e4e019988a596c161fa52a9a00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
NOT MERGE" into sc-v2-dev am: f5aaf7019d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622
Change-Id: I4b09b0a6e6615393ad755e75fce564d327e81dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
MERGE am: 8758cd1030 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18122622
Change-Id: Ib0fafa6359906880658fd5bc67f6525d1dfa376c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029504
Change-Id: I60323ba01a16be6a0c5258a5618db998f3c1b728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
|
|
|
|
in constructor" into sc-dev am: 58a3381c4f -s ours am: 858f8bb561 -s ours am: 3d961418d4 -s ours am: bfb51bb9a2 -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: I473bc077854452476ce7f1e9ee1d7fc43cd981cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
constructor am: b4a2d3a77a -s ours am: 4cdd9efd68 -s ours am: ead70849bc -s ours am: 60972e9dff -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: I68791329a996fa4d4da27322f6d1e8b6660326fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
in constructor" into sc-dev am: 58a3381c4f -s ours am: d2c9d0517b -s ours am: 15fed65e27 -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: Id5c491fbae5099e47a2721ccb60f580c7bcaf965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
constructor am: b4a2d3a77a -s ours am: a939e7c71c -s ours am: 60476d1d11 -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: Ibffce5fb264a810b52d12181dc6b0b8915799727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
in constructor" into sc-dev am: 58a3381c4f -s ours am: 858f8bb561 -s ours am: 3d961418d4 -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: I3821774ee2243cdfb22e4d41b87cee7b3b98e9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
constructor am: b4a2d3a77a -s ours am: 4cdd9efd68 -s ours am: ead70849bc -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: Ic7a117feac9f40a18928a86497b852311649b463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
in constructor" into sc-dev am: 58a3381c4f -s ours am: 858f8bb561 -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: Ic2bdd0a020482e21cdb1850dbe5c5e49ebad48f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
constructor am: b4a2d3a77a -s ours am: 4cdd9efd68 -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: I1f7b0ee524989df24fa25472f43e1672d17c1e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
in constructor" into sc-dev am: 58a3381c4f -s ours am: d2c9d0517b -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: I67ca4fd8d1548c57d1e86cb0124201a2a88f7241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
constructor am: b4a2d3a77a -s ours am: a939e7c71c -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: Iab8cb08849e44a045706aa73d3374d9a1d6fbe45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
in constructor" into sc-dev am: 58a3381c4f -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: I56266aca60708275f8263aa166efe8603a1fd530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
constructor am: b4a2d3a77a -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: I08de8fb930419222db9f0b8299dcae9b43ba063d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
in constructor" into sc-dev am: 58a3381c4f -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: I4e4edabc46015320a46c11f702114f119a41cad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
constructor am: b4a2d3a77a -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15829070
Change-Id: Idafa7b203b38b9cdf8d825291f93ad8449eb3a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
sc-dev
|
|
4ac285c63e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19050000
Change-Id: Ie650af833595486a80d83cd2c0668c695b98bbac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
|